Add custom ESLint code style rule for imports

Implements a custom ESLint plugin (`eslint-plugin-coriolis-web`) that
contains a rule which removes the duplicate name found when importing a
React component.

When using the VSCode auto import feature for React components, the
import path contains both the component parent folder and the component
file name. For this project, the component file name is not required
(because it has a `package.json` file, thus defining it as a module) and
it just pollutes the import path.

.eslintrc

@@ -17,7 +17,8 @@
   ],
   "plugins": [
     "import",
-    "react"
+    "react",
+    "coriolis-web"
   ],
   "env": {
     "browser": true,
@@ -35,6 +36,7 @@
     "src/**/package.json"
   ],
   "rules": {
+    "coriolis-web/import-no-duplicate-name": "error",
     "react/function-component-definition": "off",
     "react/sort-comp": "off",
     "react/jsx-one-expression-per-line": "off",

package.json

@@ -35,6 +35,7 @@
     "eslint": "^8.2.0",
     "eslint-config-airbnb": "19.0.0",
     "eslint-config-airbnb-typescript": "^14.0.2",
+    "eslint-plugin-coriolis-web": "./src/utils/eslint-plugin-coriolis-web",
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-react": "^7.27.0",

src/components/App.tsx

@@ -37,12 +37,12 @@ import ProjectDetailsPage from '@src/components/smart/ProjectDetailsPage'
 import DashboardPage from '@src/components/smart/DashboardPage'
 import LogsPage from '@src/components/smart/LogsPage'
 import LogStreamPage from '@src/components/smart/LogStreamPage'
-import WizardPage from '@src/components/smart/WizardPage/WizardPage'
+import WizardPage from '@src/components/smart/WizardPage'
 
-import Tooltip from '@src/components/ui/Tooltip/Tooltip'
+import Tooltip from '@src/components/ui/Tooltip'
 
-import MinionPoolsPage from '@src/components/smart/MinionPoolsPage/MinionPoolsPage'
-import MinionPoolDetailsPage from '@src/components/smart/MinionPoolDetailsPage/MinionPoolDetailsPage'
+import MinionPoolsPage from '@src/components/smart/MinionPoolsPage'
+import MinionPoolDetailsPage from '@src/components/smart/MinionPoolDetailsPage'
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import configLoader from '@src/utils/Config'
 import { navigationMenu } from '@src/constants'

src/components/modules/AssessmentModule/AssessedVmListItem/AssessedVmListItem.tsx

@@ -16,9 +16,9 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 
-import Checkbox from '@src/components/ui/Checkbox/Checkbox'
-import InfoIcon from '@src/components/ui/InfoIcon/InfoIcon'
-import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink/DropdownLink'
+import Checkbox from '@src/components/ui/Checkbox'
+import InfoIcon from '@src/components/ui/InfoIcon'
+import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink'
 import type { VmItem } from '@src/@types/Assessment'
 import { ThemePalette } from '@src/components/Theme'
 

src/components/modules/AssessmentModule/AssessmentDetailsContent/AssessmentDetailsContent.tsx

@@ -17,15 +17,15 @@ import styled, { css } from 'styled-components'
 import moment from 'moment'
 import { observer } from 'mobx-react'
 
-import DetailsNavigation from '@src/components/modules/NavigationModule/DetailsNavigation/DetailsNavigation'
-import Button from '@src/components/ui/Button/Button'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink/DropdownLink'
-import Table from '@src/components/ui/Table/Table'
-import AssessedVmListItem from '@src/components/modules/AssessmentModule/AssessedVmListItem/AssessedVmListItem'
-import DropdownFilter from '@src/components/ui/Dropdowns/DropdownFilter/DropdownFilter'
-import Checkbox from '@src/components/ui/Checkbox/Checkbox'
-import SmallLoading from '@src/components/ui/SmallLoading/SmallLoading'
+import DetailsNavigation from '@src/components/modules/NavigationModule/DetailsNavigation'
+import Button from '@src/components/ui/Button'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink'
+import Table from '@src/components/ui/Table'
+import AssessedVmListItem from '@src/components/modules/AssessmentModule/AssessedVmListItem'
+import DropdownFilter from '@src/components/ui/Dropdowns/DropdownFilter'
+import Checkbox from '@src/components/ui/Checkbox'
+import SmallLoading from '@src/components/ui/SmallLoading'
 
 import type { Assessment, VmItem, AzureLocation } from '@src/@types/Assessment'
 import type { Endpoint } from '@src/@types/Endpoint'

src/components/modules/AssessmentModule/AssessmentListItem/AssessmentListItem.tsx

@@ -16,7 +16,7 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import StatusPill from '@src/components/ui/StatusComponents/StatusPill/StatusPill'
+import StatusPill from '@src/components/ui/StatusComponents/StatusPill'
 
 import type { Assessment } from '@src/@types/Assessment'
 

src/components/modules/AssessmentModule/AssessmentMigrationOptions/AssessmentMigrationOptions.tsx

@@ -16,9 +16,9 @@ import * as React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import Button from '@src/components/ui/Button/Button'
-import FieldInput from '@src/components/ui/FieldInput/FieldInput'
-import ToggleButtonBar from '@src/components/ui/ToggleButtonBar/ToggleButtonBar'
+import Button from '@src/components/ui/Button'
+import FieldInput from '@src/components/ui/FieldInput'
+import ToggleButtonBar from '@src/components/ui/ToggleButtonBar'
 
 import type { Field } from '@src/@types/Field'
 

src/components/modules/DashboardModule/DashboardActivity/DashboardActivity.tsx

@@ -17,12 +17,12 @@ import { observer } from 'mobx-react'
 import styled from 'styled-components'
 import { Link } from 'react-router-dom'
 
-import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon/StatusIcon'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import Button from '@src/components/ui/Button/Button'
+import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import Button from '@src/components/ui/Button'
 import {
   InfoColumn, MainItemInfo, ItemReplicaBadge, ItemTitle, ItemDescription,
-} from '@src/components/ui/Dropdowns/NotificationDropdown/NotificationDropdown'
+} from '@src/components/ui/Dropdowns/NotificationDropdown'
 
 import type { NotificationItemData } from '@src/@types/NotificationItem'
 

src/components/modules/DashboardModule/DashboardContent/DashboardContent.tsx

@@ -17,11 +17,11 @@ import { observer } from 'mobx-react'
 import styled from 'styled-components'
 import autobind from 'autobind-decorator'
 
-import DashboardInfoCount from '@src/components/modules/DashboardModule/DashboardInfoCount/DashboardInfoCount'
-import DashboardLicence from '@src/components/modules/DashboardModule/DashboardLicence/DashboardLicence'
-import DashboardActivity from '@src/components/modules/DashboardModule/DashboardActivity/DashboardActivity'
-import DashboardTopEndpoints from '@src/components/modules/DashboardModule/DashboardTopEndpoints/DashboardTopEndpoints'
-import DashboardExecutions from '@src/components/modules/DashboardModule/DashboardExecutions/DashboardExecutions'
+import DashboardInfoCount from '@src/components/modules/DashboardModule/DashboardInfoCount'
+import DashboardLicence from '@src/components/modules/DashboardModule/DashboardLicence'
+import DashboardActivity from '@src/components/modules/DashboardModule/DashboardActivity'
+import DashboardTopEndpoints from '@src/components/modules/DashboardModule/DashboardTopEndpoints'
+import DashboardExecutions from '@src/components/modules/DashboardModule/DashboardExecutions'
 
 import { ThemePalette } from '@src/components/Theme'
 

src/components/modules/DashboardModule/DashboardExecutions/DashboardExecutions.tsx

@@ -17,9 +17,9 @@ import { observer } from 'mobx-react'
 import styled from 'styled-components'
 import moment from 'moment'
 
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink/DropdownLink'
-import DashboardBarChart from '@src/components/modules/DashboardModule/DashboardBarChart/DashboardBarChart'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink'
+import DashboardBarChart from '@src/components/modules/DashboardModule/DashboardBarChart'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 

src/components/modules/DashboardModule/DashboardInfoCount/DashboardInfoCount.tsx

@@ -17,7 +17,7 @@ import { observer } from 'mobx-react'
 import styled from 'styled-components'
 import { Link } from 'react-router-dom'
 
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 

src/components/modules/DashboardModule/DashboardLicence/DashboardLicence.tsx

@@ -17,14 +17,14 @@ import { observer } from 'mobx-react'
 import styled from 'styled-components'
 import moment from 'moment'
 
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import InfoIcon from '@src/components/ui/InfoIcon/InfoIcon'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import InfoIcon from '@src/components/ui/InfoIcon'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 
 import type { Licence, LicenceServerStatus } from '@src/@types/Licence'
-import CopyValue from '@src/components/ui/CopyValue/CopyValue'
-import Button from '@src/components/ui/Button/Button'
+import CopyValue from '@src/components/ui/CopyValue'
+import Button from '@src/components/ui/Button'
 
 import licenceImage from '@src/components/modules/LicenceModule/images/licence'
 

src/components/modules/DashboardModule/DashboardPieChart/package.json

@@ -1,7 +1,6 @@
 {
-  "name": "PieChart",
+  "name": "DashboardPieChart",
   "version": "0.0.0",
   "private": true,
-  "main": "./PieChart.tsx"
+  "main": "./DashboardPieChart.tsx"
 }
-

src/components/modules/DashboardModule/DashboardTopEndpoints/DashboardTopEndpoints.tsx

@@ -17,10 +17,10 @@ import { observer } from 'mobx-react'
 import styled from 'styled-components'
 import { Link } from 'react-router-dom'
 
-import Button from '@src/components/ui/Button/Button'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
-import DashboardPieChart from '@src/components/modules/DashboardModule/DashboardPieChart/DashboardPieChart'
+import Button from '@src/components/ui/Button'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
+import DashboardPieChart from '@src/components/modules/DashboardModule/DashboardPieChart'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 

src/components/modules/DetailsModule/DetailsContentHeader/DetailsContentHeader.tsx

@@ -17,9 +17,9 @@ import { observer } from 'mobx-react'
 import styled from 'styled-components'
 import { Link } from 'react-router-dom'
 
-import StatusPill from '@src/components/ui/StatusComponents/StatusPill/StatusPill'
-import ActionDropdown from '@src/components/ui/Dropdowns/ActionDropdown/ActionDropdown'
-import type { Action as DropdownAction } from '@src/components/ui/Dropdowns/ActionDropdown/ActionDropdown'
+import StatusPill from '@src/components/ui/StatusComponents/StatusPill'
+import ActionDropdown from '@src/components/ui/Dropdowns/ActionDropdown'
+import type { Action as DropdownAction } from '@src/components/ui/Dropdowns/ActionDropdown'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 

src/components/modules/DetailsModule/DetailsPageHeader/DetailsPageHeader.tsx

@@ -17,10 +17,10 @@ import { Link } from 'react-router-dom'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import NavigationMini from '@src/components/modules/NavigationModule/NavigationMini/NavigationMini'
-import NotificationDropdown from '@src/components/ui/Dropdowns/NotificationDropdown/NotificationDropdown'
-import UserDropdown from '@src/components/ui/Dropdowns/UserDropdown/UserDropdown'
-import AboutModal from '@src/components/smart/AboutModal/AboutModal'
+import NavigationMini from '@src/components/modules/NavigationModule/NavigationMini'
+import NotificationDropdown from '@src/components/ui/Dropdowns/NotificationDropdown'
+import UserDropdown from '@src/components/ui/Dropdowns/UserDropdown'
+import AboutModal from '@src/components/smart/AboutModal'
 
 import type { User as UserType } from '@src/@types/User'
 

src/components/modules/EndpointModule/ChooseProvider/ChooseProvider.tsx

@@ -18,9 +18,9 @@ import styled from 'styled-components'
 
 import notificationStore from '@src/stores/NotificationStore'
 
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
-import Button from '@src/components/ui/Button/Button'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
+import Button from '@src/components/ui/Button'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import FileUtils from '@src/utils/FileUtils'

src/components/modules/EndpointModule/ChooseProvider/MultipleUploadedEndpoints.tsx

@@ -18,14 +18,14 @@ import styled from 'styled-components'
 
 import type { Endpoint, MultiValidationItem } from '@src/@types/Endpoint'
 
-import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon/StatusIcon'
-import Button from '@src/components/ui/Button/Button'
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
-import LoadingButton from '@src/components/ui/LoadingButton/LoadingButton'
+import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon'
+import Button from '@src/components/ui/Button'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
+import LoadingButton from '@src/components/ui/LoadingButton'
 
 import DomUtils from '@src/utils/DomUtils'
 import notificationStore from '@src/stores/NotificationStore'
-import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink/DropdownLink'
+import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink'
 import { Region } from '@src/@types/Region'
 import deleteHoverImage from './images/delete-hover.svg'
 import deleteImage from './images/delete.svg'

src/components/modules/EndpointModule/EndpointDetailsContent/EndpointDetailsContent.tsx

@@ -17,12 +17,12 @@ import { Link } from 'react-router-dom'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
-import PasswordValue from '@src/components/ui/PasswordValue/PasswordValue'
-import Button from '@src/components/ui/Button/Button'
-import CopyValue from '@src/components/ui/CopyValue/CopyValue'
-import CopyMultilineValue from '@src/components/ui/CopyMultilineValue/CopyMultilineValue'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
+import PasswordValue from '@src/components/ui/PasswordValue'
+import Button from '@src/components/ui/Button'
+import CopyValue from '@src/components/ui/CopyValue'
+import CopyMultilineValue from '@src/components/ui/CopyMultilineValue'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
 
 import type { Endpoint } from '@src/@types/Endpoint'
 import { ThemePalette, ThemeProps } from '@src/components/Theme'

src/components/modules/EndpointModule/EndpointDuplicateOptions/EndpointDuplicateOptions.tsx

@@ -16,9 +16,9 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import Button from '@src/components/ui/Button/Button'
-import FieldInput from '@src/components/ui/FieldInput/FieldInput'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import Button from '@src/components/ui/Button'
+import FieldInput from '@src/components/ui/FieldInput'
 
 import KeyboardManager from '@src/utils/KeyboardManager'
 import type { Project } from '@src/@types/Project'

src/components/modules/EndpointModule/EndpointListItem/EndpointListItem.tsx

@@ -17,8 +17,8 @@ import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
 import type { Endpoint } from '@src/@types/Endpoint'
-import Checkbox from '@src/components/ui/Checkbox/Checkbox'
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
+import Checkbox from '@src/components/ui/Checkbox'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import DateUtils from '@src/utils/DateUtils'
 

src/components/modules/EndpointModule/EndpointModal/EndpointModal.tsx

@@ -17,12 +17,12 @@ import styled from 'styled-components'
 import { observer } from 'mobx-react'
 import { observe } from 'mobx'
 
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
-import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon/StatusIcon'
-import CopyButton from '@src/components/ui/CopyButton/CopyButton'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import Button from '@src/components/ui/Button/Button'
-import LoadingButton from '@src/components/ui/LoadingButton/LoadingButton'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
+import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon'
+import CopyButton from '@src/components/ui/CopyButton'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import Button from '@src/components/ui/Button'
+import LoadingButton from '@src/components/ui/LoadingButton'
 
 import type { Endpoint as EndpointType } from '@src/@types/Endpoint'
 import type { Field } from '@src/@types/Field'

src/components/modules/EndpointModule/EndpointModal/package.json

@@ -1,7 +1,6 @@
 {
-  "name": "Endpoint",
+  "name": "EndpointModal",
   "version": "0.0.0",
   "private": true,
-  "main":"./Endpoint.tsx"
+  "main": "./EndpointModal.tsx"
 }
-

src/components/modules/EndpointModule/EndpointValidation/EndpointValidation.tsx

@@ -16,9 +16,9 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 
-import Button from '@src/components/ui/Button/Button'
-import CopyButton from '@src/components/ui/CopyButton/CopyButton'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
+import Button from '@src/components/ui/Button'
+import CopyButton from '@src/components/ui/CopyButton'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
 
 import { ThemePalette } from '@src/components/Theme'
 import type { Validation as ValidationType } from '@src/@types/Endpoint'

src/components/modules/LicenceModule/LicenceModule.tsx

@@ -17,11 +17,11 @@ import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 import moment from 'moment'
 
-import Button from '@src/components/ui/Button/Button'
-import LoadingButton from '@src/components/ui/LoadingButton/LoadingButton'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import TextArea from '@src/components/ui/TextArea/TextArea'
-import CopyValue from '@src/components/ui/CopyValue/CopyValue'
+import Button from '@src/components/ui/Button'
+import LoadingButton from '@src/components/ui/LoadingButton'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import TextArea from '@src/components/ui/TextArea'
+import CopyValue from '@src/components/ui/CopyValue'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import FileUtils from '@src/utils/FileUtils'

src/components/modules/LoginModule/LoginForm/LoginForm.tsx

@@ -16,10 +16,10 @@ import React, { FormEvent } from 'react'
 import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 
-import Button from '@src/components/ui/Button/Button'
-import LoginOptions from '@src/components/modules/LoginModule/LoginOptions/LoginOptions'
-import LoadingButton from '@src/components/ui/LoadingButton/LoadingButton'
-import LoginFormField from '@src/components/modules/LoginModule/LoginFormField/LoginFormField'
+import Button from '@src/components/ui/Button'
+import LoginOptions from '@src/components/modules/LoginModule/LoginOptions'
+import LoadingButton from '@src/components/ui/LoadingButton'
+import LoginFormField from '@src/components/modules/LoginModule/LoginFormField'
 
 import { loginButtons } from '@src/constants'
 import notificationStore from '@src/stores/NotificationStore'

src/components/modules/LoginModule/LoginFormField/LoginFormField.tsx

@@ -16,7 +16,7 @@ import React from 'react'
 import styled from 'styled-components'
 import { ThemeProps } from '@src/components/Theme'
 
-import TextInput from '@src/components/ui/TextInput/TextInput'
+import TextInput from '@src/components/ui/TextInput'
 
 const Wrapper = styled.div<any>`
   margin-bottom: 16px;

src/components/modules/MinionModule/MinionEndpointModal/MinionEndpointModal.tsx

@@ -17,15 +17,15 @@ import { observer } from 'mobx-react'
 import styled from 'styled-components'
 import { CSSTransitionGroup } from 'react-transition-group'
 
-import Modal from '@src/components/ui/Modal/Modal'
+import Modal from '@src/components/ui/Modal'
 import { Providers, ProviderTypes } from '@src/@types/Providers'
 import { Endpoint } from '@src/@types/Endpoint'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import Switch from '@src/components/ui/Switch/Switch'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import Switch from '@src/components/ui/Switch'
 import { providerTypes } from '@src/constants'
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
-import Dropdown from '@src/components/ui/Dropdowns/Dropdown/Dropdown'
-import Button from '@src/components/ui/Button/Button'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
+import Dropdown from '@src/components/ui/Dropdowns/Dropdown'
+import Button from '@src/components/ui/Button'
 import { ThemePalette } from '@src/components/Theme'
 
 const Wrapper = styled.div``

src/components/modules/MinionModule/MinionPoolConfirmationModal/MinionPoolConfirmationModal.tsx

@@ -16,12 +16,12 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import Button from '@src/components/ui/Button/Button'
+import Button from '@src/components/ui/Button'
 
 import KeyboardManager from '@src/utils/KeyboardManager'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import FieldInput from '@src/components/ui/FieldInput/FieldInput'
-import Modal from '@src/components/ui/Modal/Modal'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import FieldInput from '@src/components/ui/FieldInput'
+import Modal from '@src/components/ui/Modal'
 
 const Wrapper = styled.div<any>`
   display: flex;

src/components/modules/MinionModule/MinionPoolDetailsContent/MinionPoolDetailsContent.tsx

@@ -16,13 +16,13 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import Button from '@src/components/ui/Button/Button'
-import DetailsNavigation from '@src/components/modules/NavigationModule/DetailsNavigation/DetailsNavigation'
+import Button from '@src/components/ui/Button'
+import DetailsNavigation from '@src/components/modules/NavigationModule/DetailsNavigation'
 import type { Endpoint } from '@src/@types/Endpoint'
 import type { Field } from '@src/@types/Field'
 import { ReplicaItem, MigrationItem } from '@src/@types/MainItem'
 import { MinionPoolDetails } from '@src/@types/MinionPool'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
 import { ThemeProps } from '@src/components/Theme'
 import MinionPoolMachines from './MinionPoolMachines'
 import MinionPoolEvents from './MinionPoolEvents'

src/components/modules/MinionModule/MinionPoolDetailsContent/MinionPoolEvents.tsx

@@ -19,11 +19,11 @@ import {
   MinionPoolDetails, MinionPoolEventProgressUpdate,
 } from '@src/@types/MinionPool'
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
-import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon/StatusIcon'
-import Pagination from '@src/components/ui/Pagination/Pagination'
+import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon'
+import Pagination from '@src/components/ui/Pagination'
 import configLoader from '@src/utils/Config'
-import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink/DropdownLink'
-import InfoIcon from '@src/components/ui/InfoIcon/InfoIcon'
+import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink'
+import InfoIcon from '@src/components/ui/InfoIcon'
 
 const Wrapper = styled.div``
 const Filters = styled.div`

src/components/modules/MinionModule/MinionPoolDetailsContent/MinionPoolMachines.tsx

@@ -19,12 +19,12 @@ import { Collapse } from 'react-collapse'
 
 import { Link } from 'react-router-dom'
 import { MinionMachine, MinionPool } from '@src/@types/MinionPool'
-import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink/DropdownLink'
-import { ItemReplicaBadge } from '@src/components/ui/Dropdowns/NotificationDropdown/NotificationDropdown'
+import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink'
+import { ItemReplicaBadge } from '@src/components/ui/Dropdowns/NotificationDropdown'
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
-import Arrow from '@src/components/ui/Arrow/Arrow'
+import Arrow from '@src/components/ui/Arrow'
 
-import StatusPill from '@src/components/ui/StatusComponents/StatusPill/StatusPill'
+import StatusPill from '@src/components/ui/StatusComponents/StatusPill'
 import { MigrationItem, ReplicaItem, TransferItem } from '@src/@types/MainItem'
 import networkImage from './images/network.svg'
 

src/components/modules/MinionModule/MinionPoolDetailsContent/MinionPoolMainDetails.tsx

@@ -17,10 +17,10 @@ import { Link } from 'react-router-dom'
 import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
-import CopyValue from '@src/components/ui/CopyValue/CopyValue'
-import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon/StatusIcon'
-import CopyMultilineValue from '@src/components/ui/CopyMultilineValue/CopyMultilineValue'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
+import CopyValue from '@src/components/ui/CopyValue'
+import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon'
+import CopyMultilineValue from '@src/components/ui/CopyMultilineValue'
 
 import type { Endpoint } from '@src/@types/Endpoint'
 import type { Field as FieldType } from '@src/@types/Field'

src/components/modules/MinionModule/MinionPoolListItem/MinionPoolListItem.tsx

@@ -16,9 +16,9 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import Checkbox from '@src/components/ui/Checkbox/Checkbox'
-import StatusPill from '@src/components/ui/StatusComponents/StatusPill/StatusPill'
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
+import Checkbox from '@src/components/ui/Checkbox'
+import StatusPill from '@src/components/ui/StatusComponents/StatusPill'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 
 import DateUtils from '@src/utils/DateUtils'

src/components/modules/MinionModule/MinionPoolModal/MinionPoolModal.tsx

@@ -17,9 +17,9 @@ import styled from 'styled-components'
 import { observer } from 'mobx-react'
 import { observe } from 'mobx'
 
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import Button from '@src/components/ui/Button/Button'
-import LoadingButton from '@src/components/ui/LoadingButton/LoadingButton'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import Button from '@src/components/ui/Button'
+import LoadingButton from '@src/components/ui/LoadingButton'
 
 import type { Endpoint as EndpointType } from '@src/@types/Endpoint'
 import { Field, isEnumSeparator } from '@src/@types/Field'

src/components/modules/MinionModule/MinionPoolModal/MinionPoolModalContent.tsx

@@ -17,13 +17,13 @@ import styled from 'styled-components'
 
 import LabelDictionary from '@src/utils/LabelDictionary'
 
-import FieldInput from '@src/components/ui/FieldInput/FieldInput'
+import FieldInput from '@src/components/ui/FieldInput'
 import type { Field } from '@src/@types/Field'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
 import { Endpoint } from '@src/@types/Endpoint'
-import ToggleButtonBar from '@src/components/ui/ToggleButtonBar/ToggleButtonBar'
+import ToggleButtonBar from '@src/components/ui/ToggleButtonBar'
 
 const Wrapper = styled.div<any>`
   display: flex;

src/components/modules/NavigationModule/Navigation/Navigation.tsx

@@ -18,7 +18,7 @@ import { observer } from 'mobx-react'
 import styled from 'styled-components'
 import autobind from 'autobind-decorator'
 
-import Logo from '@src/components/ui/Logo/Logo'
+import Logo from '@src/components/ui/Logo'
 import userStore from '@src/stores/UserStore'
 import configLoader from '@src/utils/Config'
 

src/components/modules/NavigationModule/NavigationMini/NavigationMini.tsx

@@ -16,7 +16,7 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 
-import Navigation from '@src/components/modules/NavigationModule/Navigation/Navigation'
+import Navigation from '@src/components/modules/NavigationModule/Navigation'
 
 import { ThemeProps } from '@src/components/Theme'
 import menuImage from './images/menu'

src/components/modules/NotificationsModule/NotificationsModule.tsx

@@ -21,9 +21,9 @@ import { observe } from 'mobx'
 import { AxiosRequestConfig } from 'axios'
 import notificationStore from '@src/stores/NotificationStore'
 
-import CopyMultilineValue from '@src/components/ui/CopyMultilineValue/CopyMultilineValue'
-import Button from '@src/components/ui/Button/Button'
-import Modal from '@src/components/ui/Modal/Modal'
+import CopyMultilineValue from '@src/components/ui/CopyMultilineValue'
+import Button from '@src/components/ui/Button'
+import Modal from '@src/components/ui/Modal'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import DomUtils from '@src/utils/DomUtils'

src/components/modules/ProjectModule/ProjectDetailsContent/ProjectDetailsContent.tsx

@@ -17,13 +17,13 @@ import { Link } from 'react-router-dom'
 import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 
-import AlertModal from '@src/components/ui/AlertModal/AlertModal'
-import Table from '@src/components/ui/Table/Table'
-import CopyValue from '@src/components/ui/CopyValue/CopyValue'
-import CopyMultilineValue from '@src/components/ui/CopyMultilineValue/CopyMultilineValue'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink/DropdownLink'
-import Button from '@src/components/ui/Button/Button'
+import AlertModal from '@src/components/ui/AlertModal'
+import Table from '@src/components/ui/Table'
+import CopyValue from '@src/components/ui/CopyValue'
+import CopyMultilineValue from '@src/components/ui/CopyMultilineValue'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink'
+import Button from '@src/components/ui/Button'
 
 import type { Project, RoleAssignment, Role } from '@src/@types/Project'
 import type { User } from '@src/@types/User'

src/components/modules/ProjectModule/ProjectListItem/ProjectListItem.tsx

@@ -16,7 +16,7 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import Button from '@src/components/ui/Button/Button'
+import Button from '@src/components/ui/Button'
 import type { Project } from '@src/@types/Project'
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 

src/components/modules/ProjectModule/ProjectMemberModal/ProjectMemberModal.tsx

@@ -19,11 +19,11 @@ import styled from 'styled-components'
 import type { Field as FieldType } from '@src/@types/Field'
 import type { User } from '@src/@types/User'
 import type { Project, Role } from '@src/@types/Project'
-import Button from '@src/components/ui/Button/Button'
-import Modal from '@src/components/ui/Modal/Modal'
-import FieldInput from '@src/components/ui/FieldInput/FieldInput'
-import ToggleButtonBar from '@src/components/ui/ToggleButtonBar/ToggleButtonBar'
-import AutocompleteDropdown from '@src/components/ui/Dropdowns/AutocompleteDropdown/AutocompleteDropdown'
+import Button from '@src/components/ui/Button'
+import Modal from '@src/components/ui/Modal'
+import FieldInput from '@src/components/ui/FieldInput'
+import ToggleButtonBar from '@src/components/ui/ToggleButtonBar'
+import AutocompleteDropdown from '@src/components/ui/Dropdowns/AutocompleteDropdown'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import KeyboardManager from '@src/utils/KeyboardManager'

src/components/modules/ProjectModule/ProjectModal/ProjectModal.tsx

@@ -18,9 +18,9 @@ import styled from 'styled-components'
 
 import type { Project } from '@src/@types/Project'
 import type { Field as FieldType } from '@src/@types/Field'
-import Button from '@src/components/ui/Button/Button'
-import Modal from '@src/components/ui/Modal/Modal'
-import FieldInput from '@src/components/ui/FieldInput/FieldInput'
+import Button from '@src/components/ui/Button'
+import Modal from '@src/components/ui/Modal'
+import FieldInput from '@src/components/ui/FieldInput'
 
 import LabelDictionary from '@src/utils/LabelDictionary'
 import KeyboardManager from '@src/utils/KeyboardManager'

src/components/modules/TransferModule/DeleteReplicaModal/DeleteReplicaModal.tsx

@@ -16,9 +16,9 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import Modal from '@src/components/ui/Modal/Modal'
-import Button from '@src/components/ui/Button/Button'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
+import Modal from '@src/components/ui/Modal'
+import Button from '@src/components/ui/Button'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
 
 import { ThemePalette } from '@src/components/Theme'
 

src/components/modules/TransferModule/Executions/Executions.tsx

@@ -16,12 +16,12 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import StatusPill from '@src/components/ui/StatusComponents/StatusPill/StatusPill'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import CopyValue from '@src/components/ui/CopyValue/CopyValue'
-import Button from '@src/components/ui/Button/Button'
-import Timeline from '@src/components/modules/TransferModule/Timeline/Timeline'
-import Tasks from '@src/components/modules/TransferModule/Tasks/Tasks'
+import StatusPill from '@src/components/ui/StatusComponents/StatusPill'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import CopyValue from '@src/components/ui/CopyValue'
+import Button from '@src/components/ui/Button'
+import Timeline from '@src/components/modules/TransferModule/Timeline'
+import Tasks from '@src/components/modules/TransferModule/Tasks'
 
 import type { Execution, ExecutionTasks } from '@src/@types/Execution'
 import { ThemePalette } from '@src/components/Theme'

src/components/modules/TransferModule/MainDetails/MainDetails.tsx

@@ -17,12 +17,12 @@ import { Link } from 'react-router-dom'
 import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
-import CopyValue from '@src/components/ui/CopyValue/CopyValue'
-import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon/StatusIcon'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import TransferDetailsTable from '@src/components/modules/TransferModule/TransferDetailsTable/TransferDetailsTable'
-import PasswordValue from '@src/components/ui/PasswordValue/PasswordValue'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
+import CopyValue from '@src/components/ui/CopyValue'
+import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import TransferDetailsTable from '@src/components/modules/TransferModule/TransferDetailsTable'
+import PasswordValue from '@src/components/ui/PasswordValue'
 
 import type { Instance } from '@src/@types/Instance'
 import type { Endpoint, StorageBackend } from '@src/@types/Endpoint'

src/components/modules/TransferModule/MigrationDetailsContent/MigrationDetailsContent.tsx

@@ -16,10 +16,10 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import Button from '@src/components/ui/Button/Button'
-import DetailsNavigation from '@src/components/modules/NavigationModule/DetailsNavigation/DetailsNavigation'
-import MainDetails from '@src/components/modules/TransferModule/MainDetails/MainDetails'
-import Tasks from '@src/components/modules/TransferModule/Tasks/Tasks'
+import Button from '@src/components/ui/Button'
+import DetailsNavigation from '@src/components/modules/NavigationModule/DetailsNavigation'
+import MainDetails from '@src/components/modules/TransferModule/MainDetails'
+import Tasks from '@src/components/modules/TransferModule/Tasks'
 
 import type { Instance } from '@src/@types/Instance'
 import type { Endpoint, StorageBackend } from '@src/@types/Endpoint'

src/components/modules/TransferModule/ReplicaDetailsContent/ReplicaDetailsContent.tsx

@@ -17,11 +17,11 @@ import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
 import scheduleStore from '@src/stores/ScheduleStore'
-import Button from '@src/components/ui/Button/Button'
-import DetailsNavigation from '@src/components/modules/NavigationModule/DetailsNavigation/DetailsNavigation'
-import MainDetails from '@src/components/modules/TransferModule/MainDetails/MainDetails'
-import Executions from '@src/components/modules/TransferModule/Executions/Executions'
-import Schedule from '@src/components/modules/TransferModule/Schedule/Schedule'
+import Button from '@src/components/ui/Button'
+import DetailsNavigation from '@src/components/modules/NavigationModule/DetailsNavigation'
+import MainDetails from '@src/components/modules/TransferModule/MainDetails'
+import Executions from '@src/components/modules/TransferModule/Executions'
+import Schedule from '@src/components/modules/TransferModule/Schedule'
 import type { Instance } from '@src/@types/Instance'
 import type { Endpoint, StorageBackend } from '@src/@types/Endpoint'
 import type { Execution, ExecutionTasks } from '@src/@types/Execution'

src/components/modules/TransferModule/ReplicaExecutionOptions/ReplicaExecutionOptions.tsx

@@ -16,8 +16,8 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import Button from '@src/components/ui/Button/Button'
-import FieldInput from '@src/components/ui/FieldInput/FieldInput'
+import Button from '@src/components/ui/Button'
+import FieldInput from '@src/components/ui/FieldInput'
 
 import LabelDictionary from '@src/utils/LabelDictionary'
 import KeyboardManager from '@src/utils/KeyboardManager'

src/components/modules/TransferModule/ReplicaMigrationOptions/ReplicaMigrationOptions.tsx

@@ -16,10 +16,10 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import Button from '@src/components/ui/Button/Button'
-import FieldInput from '@src/components/ui/FieldInput/FieldInput'
-import ToggleButtonBar from '@src/components/ui/ToggleButtonBar/ToggleButtonBar'
-import WizardScripts from '@src/components/modules/WizardModule/WizardScripts/WizardScripts'
+import Button from '@src/components/ui/Button'
+import FieldInput from '@src/components/ui/FieldInput'
+import ToggleButtonBar from '@src/components/ui/ToggleButtonBar'
+import WizardScripts from '@src/components/modules/WizardModule/WizardScripts'
 
 import LabelDictionary from '@src/utils/LabelDictionary'
 import KeyboardManager from '@src/utils/KeyboardManager'
@@ -28,7 +28,7 @@ import type { Field } from '@src/@types/Field'
 import type { Instance, InstanceScript } from '@src/@types/Instance'
 import { TransferItemDetails } from '@src/@types/MainItem'
 import { MinionPool } from '@src/@types/MinionPool'
-import { INSTANCE_OSMORPHING_MINION_POOL_MAPPINGS } from '@src/components/modules/WizardModule/WizardOptions/WizardOptions'
+import { INSTANCE_OSMORPHING_MINION_POOL_MAPPINGS } from '@src/components/modules/WizardModule/WizardOptions'
 import { ThemeProps } from '@src/components/Theme'
 import replicaMigrationFields from './replicaMigrationFields'
 import replicaMigrationImage from './images/replica-migration.svg'

src/components/modules/TransferModule/Schedule/Schedule.tsx

@@ -17,20 +17,20 @@ import styled from 'styled-components'
 import moment from 'moment-timezone'
 import { observer } from 'mobx-react'
 
-import Button from '@src/components/ui/Button/Button'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import Modal from '@src/components/ui/Modal/Modal'
-import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink/DropdownLink'
-import AlertModal from '@src/components/ui/AlertModal/AlertModal'
-import ReplicaExecutionOptions from '@src/components/modules/TransferModule/ReplicaExecutionOptions/ReplicaExecutionOptions'
-import ScheduleItem from '@src/components/modules/TransferModule/ScheduleItem/ScheduleItem'
+import Button from '@src/components/ui/Button'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import Modal from '@src/components/ui/Modal'
+import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink'
+import AlertModal from '@src/components/ui/AlertModal'
+import ReplicaExecutionOptions from '@src/components/modules/TransferModule/ReplicaExecutionOptions'
+import ScheduleItem from '@src/components/modules/TransferModule/ScheduleItem'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import DateUtils from '@src/utils/DateUtils'
 import type { Schedule as ScheduleType } from '@src/@types/Schedule'
 import type { Field } from '@src/@types/Field'
 
-import LoadingButton from '@src/components/ui/LoadingButton/LoadingButton'
+import LoadingButton from '@src/components/ui/LoadingButton'
 import scheduleImage from './images/schedule.svg'
 
 const Wrapper = styled.div<any>`

src/components/modules/TransferModule/ScheduleItem/ScheduleItem.tsx

@@ -17,17 +17,17 @@ import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 import moment from 'moment'
 
-import Switch from '@src/components/ui/Switch/Switch'
-import Dropdown from '@src/components/ui/Dropdowns/Dropdown/Dropdown'
-import DatetimePicker from '@src/components/ui/DatetimePicker/DatetimePicker'
-import Button from '@src/components/ui/Button/Button'
+import Switch from '@src/components/ui/Switch'
+import Dropdown from '@src/components/ui/Dropdowns/Dropdown'
+import DatetimePicker from '@src/components/ui/DatetimePicker'
+import Button from '@src/components/ui/Button'
 import type { Schedule, ScheduleFieldName } from '@src/@types/Schedule'
 
 import { executionOptions } from '@src/constants'
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import DateUtils from '@src/utils/DateUtils'
 import notificationStore from '@src/stores/NotificationStore'
-import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon/StatusIcon'
+import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon'
 import deleteImage from './images/delete.svg'
 import deleteHoverImage from './images/delete-hover.svg'
 import saveImage from './images/save.svg'

src/components/modules/TransferModule/TaskItem/TaskItem.tsx

@@ -18,12 +18,12 @@ import styled, { css, createGlobalStyle } from 'styled-components'
 import { Collapse } from 'react-collapse'
 
 import type { ProgressUpdate, Task } from '@src/@types/Task'
-import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon/StatusIcon'
-import Arrow from '@src/components/ui/Arrow/Arrow'
-import StatusPill from '@src/components/ui/StatusComponents/StatusPill/StatusPill'
-import CopyValue from '@src/components/ui/CopyValue/CopyValue'
-import ProgressBar from '@src/components/ui/ProgressBar/ProgressBar'
-import CopyButton from '@src/components/ui/CopyButton/CopyButton'
+import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon'
+import Arrow from '@src/components/ui/Arrow'
+import StatusPill from '@src/components/ui/StatusComponents/StatusPill'
+import CopyValue from '@src/components/ui/CopyValue'
+import ProgressBar from '@src/components/ui/ProgressBar'
+import CopyButton from '@src/components/ui/CopyButton'
 import notificationStore from '@src/stores/NotificationStore'
 import DomUtils from '@src/utils/DomUtils'
 import { ThemePalette, ThemeProps } from '@src/components/Theme'

src/components/modules/TransferModule/Tasks/Tasks.tsx

@@ -16,11 +16,11 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import TaskItem from '@src/components/modules/TransferModule/TaskItem/TaskItem'
+import TaskItem from '@src/components/modules/TransferModule/TaskItem'
 
 import type { Task } from '@src/@types/Task'
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
 
 const ColumnWidths = ['26%', '18%', '36%', '20%']
 

src/components/modules/TransferModule/Timeline/Timeline.tsx

@@ -17,8 +17,8 @@ import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
 import type { Execution } from '@src/@types/Execution'
-import Arrow from '@src/components/ui/Arrow/Arrow'
-import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon/StatusIcon'
+import Arrow from '@src/components/ui/Arrow'
+import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import DateUtils from '@src/utils/DateUtils'

src/components/modules/TransferModule/TransferDetailsTable/TransferDetailsTable.tsx

@@ -16,7 +16,7 @@ import * as React from 'react'
 import styled, { createGlobalStyle } from 'styled-components'
 import { Collapse } from 'react-collapse'
 
-import Arrow from '@src/components/ui/Arrow/Arrow'
+import Arrow from '@src/components/ui/Arrow'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 

src/components/modules/TransferModule/TransferDetailsTable/package.json

@@ -1,7 +1,6 @@
 {
-  "name": "MainDetailsTable",
+  "name": "TransferDetailsTable",
   "version": "0.0.0",
   "private": true,
-  "main": "./MainDetailsTable.tsx"
+  "main": "./TransferDetailsTable.tsx"
 }
-

src/components/modules/TransferModule/TransferItemModal/TransferItemModal.tsx

@@ -22,19 +22,19 @@ import migrationStore from '@src/stores/MigrationStore'
 import endpointStore from '@src/stores/EndpointStore'
 import { OptionsSchemaPlugin } from '@src/plugins'
 
-import Button from '@src/components/ui/Button/Button'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import Modal from '@src/components/ui/Modal/Modal'
-import Panel from '@src/components/ui/Panel/Panel'
-import { isOptionsPageValid } from '@src/components/modules/WizardModule/WizardPageContent/WizardPageContent'
-import WizardNetworks, { WizardNetworksChangeObject } from '@src/components/modules/WizardModule/WizardNetworks/WizardNetworks'
-import WizardOptions, { INSTANCE_OSMORPHING_MINION_POOL_MAPPINGS } from '@src/components/modules/WizardModule/WizardOptions/WizardOptions'
-import WizardStorage from '@src/components/modules/WizardModule/WizardStorage/WizardStorage'
+import Button from '@src/components/ui/Button'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import Modal from '@src/components/ui/Modal'
+import Panel from '@src/components/ui/Panel'
+import { isOptionsPageValid } from '@src/components/modules/WizardModule/WizardPageContent'
+import WizardNetworks, { WizardNetworksChangeObject } from '@src/components/modules/WizardModule/WizardNetworks'
+import WizardOptions, { INSTANCE_OSMORPHING_MINION_POOL_MAPPINGS } from '@src/components/modules/WizardModule/WizardOptions'
+import WizardStorage from '@src/components/modules/WizardModule/WizardStorage'
 
 import type {
   UpdateData, TransferItemDetails, MigrationItemDetails,
 } from '@src/@types/MainItem'
-import type { NavigationItem } from '@src/components/ui/Panel/Panel'
+import type { NavigationItem } from '@src/components/ui/Panel'
 import {
   Endpoint, EndpointUtils, StorageBackend, StorageMap,
 } from '@src/@types/Endpoint'
@@ -48,9 +48,9 @@ import {
 
 import { providerTypes, migrationFields } from '@src/constants'
 import configLoader from '@src/utils/Config'
-import LoadingButton from '@src/components/ui/LoadingButton/LoadingButton'
+import LoadingButton from '@src/components/ui/LoadingButton'
 import minionPoolStore from '@src/stores/MinionPoolStore'
-import WizardScripts from '@src/components/modules/WizardModule/WizardScripts/WizardScripts'
+import WizardScripts from '@src/components/modules/WizardModule/WizardScripts'
 import networkStore from '@src/stores/NetworkStore'
 import { ThemeProps } from '@src/components/Theme'
 

src/components/modules/UserModule/UserDetailsContent/UserDetailsContent.tsx

@@ -17,10 +17,10 @@ import { Link } from 'react-router-dom'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import CopyValue from '@src/components/ui/CopyValue/CopyValue'
-import CopyMultilineValue from '@src/components/ui/CopyMultilineValue/CopyMultilineValue'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import Button from '@src/components/ui/Button/Button'
+import CopyValue from '@src/components/ui/CopyValue'
+import CopyMultilineValue from '@src/components/ui/CopyMultilineValue'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import Button from '@src/components/ui/Button'
 
 import type { User } from '@src/@types/User'
 import type { Project } from '@src/@types/Project'

src/components/modules/UserModule/UserModal/UserModal.tsx

@@ -19,9 +19,9 @@ import styled from 'styled-components'
 import type { User } from '@src/@types/User'
 import type { Project } from '@src/@types/Project'
 import type { Field as FieldType } from '@src/@types/Field'
-import Button from '@src/components/ui/Button/Button'
-import Modal from '@src/components/ui/Modal/Modal'
-import FieldInput from '@src/components/ui/FieldInput/FieldInput'
+import Button from '@src/components/ui/Button'
+import Modal from '@src/components/ui/Modal'
+import FieldInput from '@src/components/ui/FieldInput'
 
 import LabelDictionary from '@src/utils/LabelDictionary'
 import KeyboardManager from '@src/utils/KeyboardManager'

src/components/modules/WizardModule/WizardBreadcrumbs/WizardBreadcrumbs.tsx

@@ -16,7 +16,7 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import Arrow from '@src/components/ui/Arrow/Arrow'
+import Arrow from '@src/components/ui/Arrow'
 
 import { ThemePalette } from '@src/components/Theme'
 import type { WizardPage } from '@src/@types/WizardData'

src/components/modules/WizardModule/WizardEndpointList/WizardEndpointList.tsx

@@ -16,10 +16,10 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
-import Dropdown from '@src/components/ui/Dropdowns/Dropdown/Dropdown'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import Button from '@src/components/ui/Button/Button'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
+import Dropdown from '@src/components/ui/Dropdowns/Dropdown'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import Button from '@src/components/ui/Button'
 
 import type { Endpoint } from '@src/@types/Endpoint'
 import { ProviderTypes } from '@src/@types/Providers'

src/components/modules/WizardModule/WizardInstances/WizardInstances.tsx

@@ -16,13 +16,13 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import Checkbox from '@src/components/ui/Checkbox/Checkbox'
-import ReloadButton from '@src/components/ui/ReloadButton/ReloadButton'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import Button from '@src/components/ui/Button/Button'
-import SearchInput from '@src/components/ui/SearchInput/SearchInput'
-import InfoIcon from '@src/components/ui/InfoIcon/InfoIcon'
-import Pagination from '@src/components/ui/Pagination/Pagination'
+import Checkbox from '@src/components/ui/Checkbox'
+import ReloadButton from '@src/components/ui/ReloadButton'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import Button from '@src/components/ui/Button'
+import SearchInput from '@src/components/ui/SearchInput'
+import InfoIcon from '@src/components/ui/InfoIcon'
+import Pagination from '@src/components/ui/Pagination'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import type { Instance as InstanceType } from '@src/@types/Instance'

src/components/modules/WizardModule/WizardNetworks/WizardNetworks.tsx

@@ -16,9 +16,9 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import AutocompleteDropdown from '@src/components/ui/Dropdowns/AutocompleteDropdown/AutocompleteDropdown'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import Dropdown from '@src/components/ui/Dropdowns/Dropdown/Dropdown'
+import AutocompleteDropdown from '@src/components/ui/Dropdowns/AutocompleteDropdown'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import Dropdown from '@src/components/ui/Dropdowns/Dropdown'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import { Instance, InstanceUtils, Nic as NicType } from '@src/@types/Instance'

src/components/modules/WizardModule/WizardOptions/WizardOptions.tsx

@@ -20,9 +20,9 @@ import autobind from 'autobind-decorator'
 import { CSSTransitionGroup } from 'react-transition-group'
 
 import configLoader from '@src/utils/Config'
-import ToggleButtonBar from '@src/components/ui/ToggleButtonBar/ToggleButtonBar'
-import FieldInput from '@src/components/ui/FieldInput/FieldInput'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
+import ToggleButtonBar from '@src/components/ui/ToggleButtonBar'
+import FieldInput from '@src/components/ui/FieldInput'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
 import type { Field } from '@src/@types/Field'
 import type { Instance } from '@src/@types/Instance'
 import type { StorageBackend } from '@src/@types/Endpoint'

src/components/modules/WizardModule/WizardPageContent/WizardPageContent.tsx

@@ -16,19 +16,19 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos/EndpointLogos'
-import WizardType from '@src/components/modules/WizardModule/WizardType/WizardType'
-import Button from '@src/components/ui/Button/Button'
-import InfoIcon from '@src/components/ui/InfoIcon/InfoIcon'
-import WizardBreadcrumbs from '@src/components/modules/WizardModule/WizardBreadcrumbs/WizardBreadcrumbs'
-import WizardEndpointList from '@src/components/modules/WizardModule/WizardEndpointList/WizardEndpointList'
-import WizardInstances from '@src/components/modules/WizardModule/WizardInstances/WizardInstances'
-import WizardNetworks, { WizardNetworksChangeObject } from '@src/components/modules/WizardModule/WizardNetworks/WizardNetworks'
-import WizardStorage from '@src/components/modules/WizardModule/WizardStorage/WizardStorage'
-import WizardOptions from '@src/components/modules/WizardModule/WizardOptions/WizardOptions'
-import WizardScripts from '@src/components/modules/WizardModule/WizardScripts/WizardScripts'
-import Schedule from '@src/components/modules/TransferModule/Schedule/Schedule'
-import WizardSummary from '@src/components/modules/WizardModule/WizardSummary/WizardSummary'
+import EndpointLogos from '@src/components/modules/EndpointModule/EndpointLogos'
+import WizardType from '@src/components/modules/WizardModule/WizardType'
+import Button from '@src/components/ui/Button'
+import InfoIcon from '@src/components/ui/InfoIcon'
+import WizardBreadcrumbs from '@src/components/modules/WizardModule/WizardBreadcrumbs'
+import WizardEndpointList from '@src/components/modules/WizardModule/WizardEndpointList'
+import WizardInstances from '@src/components/modules/WizardModule/WizardInstances'
+import WizardNetworks, { WizardNetworksChangeObject } from '@src/components/modules/WizardModule/WizardNetworks'
+import WizardStorage from '@src/components/modules/WizardModule/WizardStorage'
+import WizardOptions from '@src/components/modules/WizardModule/WizardOptions'
+import WizardScripts from '@src/components/modules/WizardModule/WizardScripts'
+import Schedule from '@src/components/modules/TransferModule/Schedule'
+import WizardSummary from '@src/components/modules/WizardModule/WizardSummary'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import { providerTypes, wizardPages, migrationFields } from '@src/constants'
@@ -48,7 +48,7 @@ import networkStore from '@src/stores/NetworkStore'
 
 import { ProviderTypes } from '@src/@types/Providers'
 import minionPoolStore from '@src/stores/MinionPoolStore'
-import LoadingButton from '@src/components/ui/LoadingButton/LoadingButton'
+import LoadingButton from '@src/components/ui/LoadingButton'
 import migrationArrowImage from './images/migration'
 
 const Wrapper = styled.div<any>`

src/components/modules/WizardModule/WizardScripts/WizardScripts.tsx

@@ -16,10 +16,10 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 
-import InfoIcon from '@src/components/ui/InfoIcon/InfoIcon'
-import { Close as InputClose } from '@src/components/ui/TextInput/TextInput'
-import { Image as InstanceImage } from '@src/components/modules/WizardModule/WizardInstances/WizardInstances'
-import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon/StatusIcon'
+import InfoIcon from '@src/components/ui/InfoIcon'
+import { Close as InputClose } from '@src/components/ui/TextInput'
+import { Image as InstanceImage } from '@src/components/modules/WizardModule/WizardInstances'
+import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import FileUtils from '@src/utils/FileUtils'

src/components/modules/WizardModule/WizardStorage/WizardStorage.tsx

@@ -16,16 +16,16 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import AutocompleteDropdown from '@src/components/ui/Dropdowns/AutocompleteDropdown/AutocompleteDropdown'
-import Dropdown from '@src/components/ui/Dropdowns/Dropdown/Dropdown'
-import InfoIcon from '@src/components/ui/InfoIcon/InfoIcon'
+import AutocompleteDropdown from '@src/components/ui/Dropdowns/AutocompleteDropdown'
+import Dropdown from '@src/components/ui/Dropdowns/Dropdown'
+import InfoIcon from '@src/components/ui/InfoIcon'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import { Instance, Disk, InstanceUtils } from '@src/@types/Instance'
 import type { StorageBackend, StorageMap } from '@src/@types/Endpoint'
 
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
-import Button from '@src/components/ui/Button/Button'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
+import Button from '@src/components/ui/Button'
 import backendImage from './images/backend.svg'
 import diskImage from './images/disk.svg'
 import bigStorageImage from './images/storage-big.svg'

src/components/modules/WizardModule/WizardSummary/WizardSummary.tsx

@@ -17,7 +17,7 @@ import { observer } from 'mobx-react'
 import styled from 'styled-components'
 import moment from 'moment'
 
-import StatusPill from '@src/components/ui/StatusComponents/StatusPill/StatusPill'
+import StatusPill from '@src/components/ui/StatusComponents/StatusPill'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import LabelDictionary from '@src/utils/LabelDictionary'
@@ -30,9 +30,9 @@ import type { Instance, Disk, InstanceScript } from '@src/@types/Instance'
 import type { Field } from '@src/@types/Field'
 
 import fieldHelper from '@src/@types/Field'
-import { getDisks } from '@src/components/modules/WizardModule/WizardStorage/WizardStorage'
+import { getDisks } from '@src/components/modules/WizardModule/WizardStorage'
 
-import { INSTANCE_OSMORPHING_MINION_POOL_MAPPINGS } from '@src/components/modules/WizardModule/WizardOptions/WizardOptions'
+import { INSTANCE_OSMORPHING_MINION_POOL_MAPPINGS } from '@src/components/modules/WizardModule/WizardOptions'
 import { MinionPool } from '@src/@types/MinionPool'
 import { ProviderTypes } from '@src/@types/Providers'
 import configLoader from '@src/utils/Config'

src/components/modules/WizardModule/WizardType/WizardType.tsx

@@ -16,7 +16,7 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import Switch from '@src/components/ui/Switch/Switch'
+import Switch from '@src/components/ui/Switch'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 

src/components/smart/AboutModal/AboutModal.tsx

@@ -16,8 +16,8 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import Modal from '@src/components/ui/Modal/Modal'
-import LicenceComponent from '@src/components/modules/LicenceModule/LicenceModule'
+import Modal from '@src/components/ui/Modal'
+import LicenceComponent from '@src/components/modules/LicenceModule'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 

src/components/smart/AssessmentDetailsPage/AssessmentDetailsPage.tsx

@@ -17,12 +17,12 @@ import styled from 'styled-components'
 import cookie from 'js-cookie'
 import { observer } from 'mobx-react'
 
-import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate/DetailsTemplate'
-import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader/DetailsPageHeader'
-import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader/DetailsContentHeader'
-import AssessmentDetailsContent from '@src/components/modules/AssessmentModule/AssessmentDetailsContent/AssessmentDetailsContent'
-import Modal from '@src/components/ui/Modal/Modal'
-import AssessmentMigrationOptions from '@src/components/modules/AssessmentModule/AssessmentMigrationOptions/AssessmentMigrationOptions'
+import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate'
+import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader'
+import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader'
+import AssessmentDetailsContent from '@src/components/modules/AssessmentModule/AssessmentDetailsContent'
+import Modal from '@src/components/ui/Modal'
+import AssessmentMigrationOptions from '@src/components/modules/AssessmentModule/AssessmentMigrationOptions'
 import type { Endpoint } from '@src/@types/Endpoint'
 import type { Nic } from '@src/@types/Instance'
 import type { VmItem } from '@src/@types/Assessment'

src/components/smart/AssessmentsPage/AssessmentsPage.tsx

@@ -16,12 +16,12 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import FilterList from '@src/components/ui/Lists/FilterList/FilterList'
-import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate/MainTemplate'
-import PageHeader from '@src/components/ui/PageHeader/PageHeader'
-import Navigation from '@src/components/modules/NavigationModule/Navigation/Navigation'
-import DropdownFilterGroup from '@src/components/ui/Dropdowns/DropdownFilterGroup/DropdownFilterGroup'
-import AssessmentListItem from '@src/components/modules/AssessmentModule/AssessmentListItem/AssessmentListItem'
+import FilterList from '@src/components/ui/Lists/FilterList'
+import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate'
+import PageHeader from '@src/components/ui/PageHeader'
+import Navigation from '@src/components/modules/NavigationModule/Navigation'
+import DropdownFilterGroup from '@src/components/ui/Dropdowns/DropdownFilterGroup'
+import AssessmentListItem from '@src/components/modules/AssessmentModule/AssessmentListItem'
 import type { Assessment } from '@src/@types/Assessment'
 import type { Endpoint } from '@src/@types/Endpoint'
 
@@ -31,7 +31,7 @@ import endpointStore from '@src/stores/EndpointStore'
 import projectStore from '@src/stores/ProjectStore'
 import userStore from '@src/stores/UserStore'
 import configLoader from '@src/utils/Config'
-import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink/DropdownLink'
+import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink'
 import DomUtils from '@src/utils/DomUtils'
 
 const Wrapper = styled.div<any>``

src/components/smart/DashboardPage/DashboardPage.tsx

@@ -24,10 +24,10 @@ import projectStore from '@src/stores/ProjectStore'
 import licenceStore from '@src/stores/LicenceStore'
 import notificationStore from '@src/stores/NotificationStore'
 
-import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate/MainTemplate'
-import Navigation from '@src/components/modules/NavigationModule/Navigation/Navigation'
-import PageHeader from '@src/components/ui/PageHeader/PageHeader'
-import DashboardContent from '@src/components/modules/DashboardModule/DashboardContent/DashboardContent'
+import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate'
+import Navigation from '@src/components/modules/NavigationModule/Navigation'
+import PageHeader from '@src/components/ui/PageHeader'
+import DashboardContent from '@src/components/modules/DashboardModule/DashboardContent'
 
 import Utils from '@src/utils/ObjectUtils'
 import configLoader from '@src/utils/Config'

src/components/smart/EndpointDetailsPage/EndpointDetailsPage.tsx

@@ -16,15 +16,15 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate/DetailsTemplate'
-import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader/DetailsPageHeader'
-import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader/DetailsContentHeader'
-import EndpointDetailsContent from '@src/components/modules/EndpointModule/EndpointDetailsContent/EndpointDetailsContent'
-import AlertModal from '@src/components/ui/AlertModal/AlertModal'
-import Modal from '@src/components/ui/Modal/Modal'
-import EndpointValidation from '@src/components/modules/EndpointModule/EndpointValidation/EndpointValidation'
-import EndpointModal from '@src/components/modules/EndpointModule/EndpointModal/EndpointModal'
-import EndpointDuplicateOptions from '@src/components/modules/EndpointModule/EndpointDuplicateOptions/EndpointDuplicateOptions'
+import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate'
+import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader'
+import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader'
+import EndpointDetailsContent from '@src/components/modules/EndpointModule/EndpointDetailsContent'
+import AlertModal from '@src/components/ui/AlertModal'
+import Modal from '@src/components/ui/Modal'
+import EndpointValidation from '@src/components/modules/EndpointModule/EndpointValidation'
+import EndpointModal from '@src/components/modules/EndpointModule/EndpointModal'
+import EndpointDuplicateOptions from '@src/components/modules/EndpointModule/EndpointDuplicateOptions'
 
 import endpointStore from '@src/stores/EndpointStore'
 import migrationStore from '@src/stores/MigrationStore'

src/components/smart/EndpointsPage/EndpointsPage.tsx

@@ -16,15 +16,15 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate/MainTemplate'
-import Navigation from '@src/components/modules/NavigationModule/Navigation/Navigation'
-import FilterList from '@src/components/ui/Lists/FilterList/FilterList'
-import PageHeader from '@src/components/ui/PageHeader/PageHeader'
-import EndpointListItem from '@src/components/modules/EndpointModule/EndpointListItem/EndpointListItem'
-import AlertModal from '@src/components/ui/AlertModal/AlertModal'
-import Modal from '@src/components/ui/Modal/Modal'
-import ChooseProvider from '@src/components/modules/EndpointModule/ChooseProvider/ChooseProvider'
-import EndpointModal from '@src/components/modules/EndpointModule/EndpointModal/EndpointModal'
+import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate'
+import Navigation from '@src/components/modules/NavigationModule/Navigation'
+import FilterList from '@src/components/ui/Lists/FilterList'
+import PageHeader from '@src/components/ui/PageHeader'
+import EndpointListItem from '@src/components/modules/EndpointModule/EndpointListItem'
+import AlertModal from '@src/components/ui/AlertModal'
+import Modal from '@src/components/ui/Modal'
+import ChooseProvider from '@src/components/modules/EndpointModule/ChooseProvider'
+import EndpointModal from '@src/components/modules/EndpointModule/EndpointModal'
 import type { Endpoint as EndpointType } from '@src/@types/Endpoint'
 
 import projectStore from '@src/stores/ProjectStore'
@@ -33,7 +33,7 @@ import endpointStore from '@src/stores/EndpointStore'
 import migrationStore from '@src/stores/MigrationStore'
 import replicaStore from '@src/stores/ReplicaStore'
 import providerStore from '@src/stores/ProviderStore'
-import EndpointDuplicateOptions from '@src/components/modules/EndpointModule/EndpointDuplicateOptions/EndpointDuplicateOptions'
+import EndpointDuplicateOptions from '@src/components/modules/EndpointModule/EndpointDuplicateOptions'
 
 import configLoader from '@src/utils/Config'
 import { ThemePalette } from '@src/components/Theme'

src/components/smart/LoginPage/LoginPage.tsx

@@ -16,9 +16,9 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import EmptyTemplate from '@src/components/modules/TemplateModule/EmptyTemplate/EmptyTemplate'
-import Logo from '@src/components/ui/Logo/Logo'
-import LoginForm from '@src/components/modules/LoginModule/LoginForm/LoginForm'
+import EmptyTemplate from '@src/components/modules/TemplateModule/EmptyTemplate'
+import Logo from '@src/components/ui/Logo'
+import LoginForm from '@src/components/modules/LoginModule/LoginForm'
 
 import userStore from '@src/stores/UserStore'
 import configStore from '@src/utils/Config'

src/components/smart/LogsPage/DownloadsContent.tsx

@@ -19,9 +19,9 @@ import moment from 'moment'
 
 import type { Log as LogType } from '@src/@types/Log'
 
-import { Close } from '@src/components/ui/TextInput/TextInput'
-import DatetimePicker from '@src/components/ui/DatetimePicker/DatetimePicker'
-import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon/StatusIcon'
+import { Close } from '@src/components/ui/TextInput'
+import DatetimePicker from '@src/components/ui/DatetimePicker'
+import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon'
 
 import { ThemeProps } from '@src/components/Theme'
 import downloadImage from './images/download.svg'

src/components/smart/LogsPage/LogsPage.tsx

@@ -16,10 +16,10 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate/MainTemplate'
-import Navigation from '@src/components/modules/NavigationModule/Navigation/Navigation'
-import PageHeader from '@src/components/ui/PageHeader/PageHeader'
-import TabNavigation from '@src/components/ui/TabNavigation/TabNavigation'
+import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate'
+import Navigation from '@src/components/modules/NavigationModule/Navigation'
+import PageHeader from '@src/components/ui/PageHeader'
+import TabNavigation from '@src/components/ui/TabNavigation'
 
 import logStore from '@src/stores/LogStore'
 import notificationStore from '@src/stores/NotificationStore'

src/components/smart/LogsPage/StreamText.tsx

@@ -17,8 +17,8 @@ import styled, { createGlobalStyle } from 'styled-components'
 import { observer } from 'mobx-react'
 import AnsiToHtml from 'ansi-to-html'
 
-import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink/DropdownLink'
-import Checkbox from '@src/components/ui/Checkbox/Checkbox'
+import DropdownLink from '@src/components/ui/Dropdowns/DropdownLink'
+import Checkbox from '@src/components/ui/Checkbox'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 

src/components/smart/MessagePage/MessagePage.tsx

@@ -14,10 +14,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React from 'react'
 import styled from 'styled-components'
-import EmptyTemplate from '@src/components/modules/TemplateModule/EmptyTemplate/EmptyTemplate'
+import EmptyTemplate from '@src/components/modules/TemplateModule/EmptyTemplate'
 import { ThemePalette } from '@src/components/Theme'
 
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
 
 import fingerprintImage from './images/fingerprint'
 

src/components/smart/MigrationDetailsPage/MigrationDetailsPage.tsx

@@ -16,14 +16,14 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate/DetailsTemplate'
-import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader/DetailsPageHeader'
-import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader/DetailsContentHeader'
-import MigrationDetailsContent from '@src/components/modules/TransferModule/MigrationDetailsContent/MigrationDetailsContent'
-import AlertModal from '@src/components/ui/AlertModal/AlertModal'
-import TransferItemModal from '@src/components/modules/TransferModule/TransferItemModal/TransferItemModal'
-import Modal from '@src/components/ui/Modal/Modal'
-import ReplicaMigrationOptions from '@src/components/modules/TransferModule/ReplicaMigrationOptions/ReplicaMigrationOptions'
+import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate'
+import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader'
+import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader'
+import MigrationDetailsContent from '@src/components/modules/TransferModule/MigrationDetailsContent'
+import AlertModal from '@src/components/ui/AlertModal'
+import TransferItemModal from '@src/components/modules/TransferModule/TransferItemModal'
+import Modal from '@src/components/ui/Modal'
+import ReplicaMigrationOptions from '@src/components/modules/TransferModule/ReplicaMigrationOptions'
 
 import migrationStore from '@src/stores/MigrationStore'
 import userStore from '@src/stores/UserStore'

src/components/smart/MigrationsPage/MigrationsPage.tsx

@@ -16,12 +16,12 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate/MainTemplate'
-import Navigation from '@src/components/modules/NavigationModule/Navigation/Navigation'
-import FilterList from '@src/components/ui/Lists/FilterList/FilterList'
-import PageHeader from '@src/components/ui/PageHeader/PageHeader'
-import AlertModal from '@src/components/ui/AlertModal/AlertModal'
-import MainListItem from '@src/components/ui/Lists/MainListItem/MainListItem'
+import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate'
+import Navigation from '@src/components/modules/NavigationModule/Navigation'
+import FilterList from '@src/components/ui/Lists/FilterList'
+import PageHeader from '@src/components/ui/PageHeader'
+import AlertModal from '@src/components/ui/AlertModal'
+import MainListItem from '@src/components/ui/Lists/MainListItem'
 
 import projectStore from '@src/stores/ProjectStore'
 import migrationStore from '@src/stores/MigrationStore'

src/components/smart/MinionPoolDetailsPage/MinionPoolDetailsPage.tsx

@@ -16,13 +16,13 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate/DetailsTemplate'
-import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader/DetailsPageHeader'
-import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader/DetailsContentHeader'
-import Modal from '@src/components/ui/Modal/Modal'
-import AlertModal from '@src/components/ui/AlertModal/AlertModal'
+import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate'
+import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader'
+import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader'
+import Modal from '@src/components/ui/Modal'
+import AlertModal from '@src/components/ui/AlertModal'
 
-import type { Action as DropdownAction } from '@src/components/ui/Dropdowns/ActionDropdown/ActionDropdown'
+import type { Action as DropdownAction } from '@src/components/ui/Dropdowns/ActionDropdown'
 
 import userStore from '@src/stores/UserStore'
 import endpointStore from '@src/stores/EndpointStore'
@@ -32,11 +32,11 @@ import configLoader from '@src/utils/Config'
 
 import { ThemePalette } from '@src/components/Theme'
 import minionPoolStore from '@src/stores/MinionPoolStore'
-import MinionPoolModal from '@src/components/modules/MinionModule/MinionPoolModal/MinionPoolModal'
-import MinionPoolDetailsContent from '@src/components/modules/MinionModule/MinionPoolDetailsContent/MinionPoolDetailsContent'
+import MinionPoolModal from '@src/components/modules/MinionModule/MinionPoolModal'
+import MinionPoolDetailsContent from '@src/components/modules/MinionModule/MinionPoolDetailsContent'
 import replicaStore from '@src/stores/ReplicaStore'
 import migrationStore from '@src/stores/MigrationStore'
-import MinionPoolConfirmationModal from '@src/components/modules/MinionModule/MinionPoolConfirmationModal/MinionPoolConfirmationModal'
+import MinionPoolConfirmationModal from '@src/components/modules/MinionModule/MinionPoolConfirmationModal'
 import providerStore from '@src/stores/ProviderStore'
 import { Field } from '@src/@types/Field'
 import minionPoolImage from './images/minion-pool.svg'

src/components/smart/MinionPoolsPage/MinionPoolsPage.tsx

@@ -18,13 +18,13 @@ import { observer } from 'mobx-react'
 
 import { RouteComponentProps } from 'react-router-dom'
 
-import Modal from '@src/components/ui/Modal/Modal'
-import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate/MainTemplate'
-import Navigation from '@src/components/modules/NavigationModule/Navigation/Navigation'
-import FilterList from '@src/components/ui/Lists/FilterList/FilterList'
-import PageHeader from '@src/components/ui/PageHeader/PageHeader'
+import Modal from '@src/components/ui/Modal'
+import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate'
+import Navigation from '@src/components/modules/NavigationModule/Navigation'
+import FilterList from '@src/components/ui/Lists/FilterList'
+import PageHeader from '@src/components/ui/PageHeader'
 
-import type { Action as DropdownAction } from '@src/components/ui/Dropdowns/ActionDropdown/ActionDropdown'
+import type { Action as DropdownAction } from '@src/components/ui/Dropdowns/ActionDropdown'
 
 import projectStore from '@src/stores/ProjectStore'
 
@@ -35,12 +35,12 @@ import providerStore from '@src/stores/ProviderStore'
 import endpointStore from '@src/stores/EndpointStore'
 import minionPoolStore from '@src/stores/MinionPoolStore'
 import { Endpoint } from '@src/@types/Endpoint'
-import MinionEndpointModal from '@src/components/modules/MinionModule/MinionEndpointModal/MinionEndpointModal'
-import MinionPoolModal from '@src/components/modules/MinionModule/MinionPoolModal/MinionPoolModal'
-import MinionPoolListItem from '@src/components/modules/MinionModule/MinionPoolListItem/MinionPoolListItem'
+import MinionEndpointModal from '@src/components/modules/MinionModule/MinionEndpointModal'
+import MinionPoolModal from '@src/components/modules/MinionModule/MinionPoolModal'
+import MinionPoolListItem from '@src/components/modules/MinionModule/MinionPoolListItem'
 import { ThemePalette } from '@src/components/Theme'
-import AlertModal from '@src/components/ui/AlertModal/AlertModal'
-import MinionPoolConfirmationModal from '@src/components/modules/MinionModule/MinionPoolConfirmationModal/MinionPoolConfirmationModal'
+import AlertModal from '@src/components/ui/AlertModal'
+import MinionPoolConfirmationModal from '@src/components/modules/MinionModule/MinionPoolConfirmationModal'
 import notificationStore from '@src/stores/NotificationStore'
 import ObjectUtils from '@src/utils/ObjectUtils'
 import emptyListImage from './images/minion-pool-empty-list.svg'

src/components/smart/ProjectDetailsPage/ProjectDetailsPage.tsx

@@ -18,13 +18,13 @@ import { observer } from 'mobx-react'
 
 import type { User } from '@src/@types/User'
 import type { Project, Role } from '@src/@types/Project'
-import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate/DetailsTemplate'
-import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader/DetailsPageHeader'
-import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader/DetailsContentHeader'
-import ProjectDetailsContent from '@src/components/modules/ProjectModule/ProjectDetailsContent/ProjectDetailsContent'
-import ProjectModal from '@src/components/modules/ProjectModule/ProjectModal/ProjectModal'
-import ProjectMemberModal from '@src/components/modules/ProjectModule/ProjectMemberModal/ProjectMemberModal'
-import AlertModal from '@src/components/ui/AlertModal/AlertModal'
+import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate'
+import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader'
+import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader'
+import ProjectDetailsContent from '@src/components/modules/ProjectModule/ProjectDetailsContent'
+import ProjectModal from '@src/components/modules/ProjectModule/ProjectModal'
+import ProjectMemberModal from '@src/components/modules/ProjectModule/ProjectMemberModal'
+import AlertModal from '@src/components/ui/AlertModal'
 
 import projectStore from '@src/stores/ProjectStore'
 import userStore from '@src/stores/UserStore'

src/components/smart/ProjectsPage/ProjectsPage.tsx

@@ -16,11 +16,11 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate/MainTemplate'
-import Navigation from '@src/components/modules/NavigationModule/Navigation/Navigation'
-import FilterList from '@src/components/ui/Lists/FilterList/FilterList'
-import PageHeader from '@src/components/ui/PageHeader/PageHeader'
-import ProjectListItem from '@src/components/modules/ProjectModule/ProjectListItem/ProjectListItem'
+import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate'
+import Navigation from '@src/components/modules/NavigationModule/Navigation'
+import FilterList from '@src/components/ui/Lists/FilterList'
+import PageHeader from '@src/components/ui/PageHeader'
+import ProjectListItem from '@src/components/modules/ProjectModule/ProjectListItem'
 
 import type { Project, RoleAssignment } from '@src/@types/Project'
 

src/components/smart/ReplicaDetailsPage/ReplicaDetailsPage.tsx

@@ -16,22 +16,22 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate/DetailsTemplate'
-import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader/DetailsPageHeader'
-import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader/DetailsContentHeader'
-import ReplicaDetailsContent from '@src/components/modules/TransferModule/ReplicaDetailsContent/ReplicaDetailsContent'
-import Modal from '@src/components/ui/Modal/Modal'
-import ReplicaExecutionOptions from '@src/components/modules/TransferModule/ReplicaExecutionOptions/ReplicaExecutionOptions'
-import AlertModal from '@src/components/ui/AlertModal/AlertModal'
-import TransferItemModal from '@src/components/modules/TransferModule/TransferItemModal/TransferItemModal'
-import ReplicaMigrationOptions from '@src/components/modules/TransferModule/ReplicaMigrationOptions/ReplicaMigrationOptions'
-import DeleteReplicaModal from '@src/components/modules/TransferModule/DeleteReplicaModal/DeleteReplicaModal'
+import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate'
+import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader'
+import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader'
+import ReplicaDetailsContent from '@src/components/modules/TransferModule/ReplicaDetailsContent'
+import Modal from '@src/components/ui/Modal'
+import ReplicaExecutionOptions from '@src/components/modules/TransferModule/ReplicaExecutionOptions'
+import AlertModal from '@src/components/ui/AlertModal'
+import TransferItemModal from '@src/components/modules/TransferModule/TransferItemModal'
+import ReplicaMigrationOptions from '@src/components/modules/TransferModule/ReplicaMigrationOptions'
+import DeleteReplicaModal from '@src/components/modules/TransferModule/DeleteReplicaModal'
 
 import type { InstanceScript } from '@src/@types/Instance'
 import type { Execution } from '@src/@types/Execution'
 import type { Schedule } from '@src/@types/Schedule'
 import type { Field } from '@src/@types/Field'
-import type { Action as DropdownAction } from '@src/components/ui/Dropdowns/ActionDropdown/ActionDropdown'
+import type { Action as DropdownAction } from '@src/components/ui/Dropdowns/ActionDropdown'
 
 import replicaStore from '@src/stores/ReplicaStore'
 import migrationStore from '@src/stores/MigrationStore'

src/components/smart/ReplicasPage/ReplicasPage.tsx

@@ -16,18 +16,18 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate/MainTemplate'
-import Navigation from '@src/components/modules/NavigationModule/Navigation/Navigation'
-import FilterList from '@src/components/ui/Lists/FilterList/FilterList'
-import PageHeader from '@src/components/ui/PageHeader/PageHeader'
-import AlertModal from '@src/components/ui/AlertModal/AlertModal'
-import MainListItem from '@src/components/ui/Lists/MainListItem/MainListItem'
-import Modal from '@src/components/ui/Modal/Modal'
-import ReplicaExecutionOptions from '@src/components/modules/TransferModule/ReplicaExecutionOptions/ReplicaExecutionOptions'
-import ReplicaMigrationOptions from '@src/components/modules/TransferModule/ReplicaMigrationOptions/ReplicaMigrationOptions'
-import DeleteReplicaModal from '@src/components/modules/TransferModule/DeleteReplicaModal/DeleteReplicaModal'
-
-import type { Action as DropdownAction } from '@src/components/ui/Dropdowns/ActionDropdown/ActionDropdown'
+import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate'
+import Navigation from '@src/components/modules/NavigationModule/Navigation'
+import FilterList from '@src/components/ui/Lists/FilterList'
+import PageHeader from '@src/components/ui/PageHeader'
+import AlertModal from '@src/components/ui/AlertModal'
+import MainListItem from '@src/components/ui/Lists/MainListItem'
+import Modal from '@src/components/ui/Modal'
+import ReplicaExecutionOptions from '@src/components/modules/TransferModule/ReplicaExecutionOptions'
+import ReplicaMigrationOptions from '@src/components/modules/TransferModule/ReplicaMigrationOptions'
+import DeleteReplicaModal from '@src/components/modules/TransferModule/DeleteReplicaModal'
+
+import type { Action as DropdownAction } from '@src/components/ui/Dropdowns/ActionDropdown'
 import type { Field } from '@src/@types/Field'
 import type { InstanceScript } from '@src/@types/Instance'
 

src/components/smart/UserDetailsPage/UserDetailsPage.tsx

@@ -17,12 +17,12 @@ import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
 import type { User } from '@src/@types/User'
-import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate/DetailsTemplate'
-import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader/DetailsPageHeader'
-import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader/DetailsContentHeader'
-import UserDetailsContent from '@src/components/modules/UserModule/UserDetailsContent/UserDetailsContent'
-import UserModal from '@src/components/modules/UserModule/UserModal/UserModal'
-import AlertModal from '@src/components/ui/AlertModal/AlertModal'
+import DetailsTemplate from '@src/components/modules/TemplateModule/DetailsTemplate'
+import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader'
+import DetailsContentHeader from '@src/components/modules/DetailsModule/DetailsContentHeader'
+import UserDetailsContent from '@src/components/modules/UserModule/UserDetailsContent'
+import UserModal from '@src/components/modules/UserModule/UserModal'
+import AlertModal from '@src/components/ui/AlertModal'
 
 import userStore from '@src/stores/UserStore'
 import projectStore from '@src/stores/ProjectStore'

src/components/smart/UsersPage/UsersPage.tsx

@@ -16,11 +16,11 @@ import React from 'react'
 import styled from 'styled-components'
 import { observer } from 'mobx-react'
 
-import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate/MainTemplate'
-import Navigation from '@src/components/modules/NavigationModule/Navigation/Navigation'
-import FilterList from '@src/components/ui/Lists/FilterList/FilterList'
-import PageHeader from '@src/components/ui/PageHeader/PageHeader'
-import UserListItem from '@src/components/modules/UserModule/UserListItem/UserListItem'
+import MainTemplate from '@src/components/modules/TemplateModule/MainTemplate'
+import Navigation from '@src/components/modules/NavigationModule/Navigation'
+import FilterList from '@src/components/ui/Lists/FilterList'
+import PageHeader from '@src/components/ui/PageHeader'
+import UserListItem from '@src/components/modules/UserModule/UserListItem'
 
 import type { User } from '@src/@types/User'
 

src/components/smart/WizardPage/WizardPage.tsx

@@ -17,11 +17,11 @@ import styled from 'styled-components'
 import autobind from 'autobind-decorator'
 import { observer } from 'mobx-react'
 
-import WizardTemplate from '@src/components/modules/TemplateModule/WizardTemplate/WizardTemplate'
-import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader/DetailsPageHeader'
-import WizardPageContent from '@src/components/modules/WizardModule/WizardPageContent/WizardPageContent'
-import Modal from '@src/components/ui/Modal/Modal'
-import EndpointModal from '@src/components/modules/EndpointModule/EndpointModal/EndpointModal'
+import WizardTemplate from '@src/components/modules/TemplateModule/WizardTemplate'
+import DetailsPageHeader from '@src/components/modules/DetailsModule/DetailsPageHeader'
+import WizardPageContent from '@src/components/modules/WizardModule/WizardPageContent'
+import Modal from '@src/components/ui/Modal'
+import EndpointModal from '@src/components/modules/EndpointModule/EndpointModal'
 
 import userStore from '@src/stores/UserStore'
 import providerStore, { getFieldChangeOptions } from '@src/stores/ProviderStore'
@@ -46,7 +46,7 @@ import ObjectUtils from '@src/utils/ObjectUtils'
 import { ProviderTypes } from '@src/@types/Providers'
 import { TransferItem, ReplicaItem } from '@src/@types/MainItem'
 import minionPoolStore from '@src/stores/MinionPoolStore'
-import { WizardNetworksChangeObject } from '@src/components/modules/WizardModule/WizardNetworks/WizardNetworks'
+import { WizardNetworksChangeObject } from '@src/components/modules/WizardModule/WizardNetworks'
 
 const Wrapper = styled.div<any>``
 

src/components/ui/AlertModal/AlertModal.tsx

@@ -16,9 +16,9 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import Modal from '@src/components/ui/Modal/Modal'
-import Button from '@src/components/ui/Button/Button'
-import StatusImage from '@src/components/ui/StatusComponents/StatusImage/StatusImage'
+import Modal from '@src/components/ui/Modal'
+import Button from '@src/components/ui/Button'
+import StatusImage from '@src/components/ui/StatusComponents/StatusImage'
 
 import { ThemePalette } from '@src/components/Theme'
 import KeyboardManager from '@src/utils/KeyboardManager'

src/components/ui/AutocompleteInput/AutocompleteInput.tsx

@@ -15,7 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import * as React from 'react'
 import styled, { css } from 'styled-components'
 
-import TextInput from '@src/components/ui/TextInput/TextInput'
+import TextInput from '@src/components/ui/TextInput'
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import arrowImage from './images/arrow'
 

src/components/ui/CopyMultilineValue/CopyMultilineValue.tsx

@@ -16,7 +16,7 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled from 'styled-components'
 
-import CopyButton from '@src/components/ui/CopyButton/CopyButton'
+import CopyButton from '@src/components/ui/CopyButton'
 import DomUtils from '@src/utils/DomUtils'
 import notificationStore from '@src/stores/NotificationStore'
 

src/components/ui/CopyValue/CopyValue.tsx

@@ -16,7 +16,7 @@ import React from 'react'
 import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 
-import CopyButton from '@src/components/ui/CopyButton/CopyButton'
+import CopyButton from '@src/components/ui/CopyButton'
 import DomUtils from '@src/utils/DomUtils'
 import notificationStore from '@src/stores/NotificationStore'
 

src/components/ui/DatetimePicker/DatetimePicker.tsx

@@ -20,7 +20,7 @@ import Datetime from 'react-datetime'
 import moment from 'moment'
 import autobind from 'autobind-decorator'
 
-import DropdownButton from '@src/components/ui/Dropdowns/DropdownButton/DropdownButton'
+import DropdownButton from '@src/components/ui/Dropdowns/DropdownButton'
 
 import DomUtils from '@src/utils/DomUtils'
 import DateUtils from '@src/utils/DateUtils'

src/components/ui/Dropdowns/ActionDropdown/ActionDropdown.tsx

@@ -18,11 +18,11 @@ import { observer } from 'mobx-react'
 import styled, { css } from 'styled-components'
 import autobind from 'autobind-decorator'
 
-import DropdownButton from '@src/components/ui/Dropdowns/DropdownButton/DropdownButton'
-import { List, ListItems, Tip } from '@src/components/ui/Dropdowns/DropdownLink/DropdownLink'
+import DropdownButton from '@src/components/ui/Dropdowns/DropdownButton'
+import { List, ListItems, Tip } from '@src/components/ui/Dropdowns/DropdownLink'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
-import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon/StatusIcon'
+import StatusIcon from '@src/components/ui/StatusComponents/StatusIcon'
 
 const Wrapper = styled.div<any>`
   position: relative;

src/components/ui/Dropdowns/AutocompleteDropdown/AutocompleteDropdown.tsx

@@ -18,7 +18,7 @@ import styled, { css } from 'styled-components'
 import ReactDOM from 'react-dom'
 import autobind from 'autobind-decorator'
 
-import AutocompleteInput from '@src/components/ui/AutocompleteInput/AutocompleteInput'
+import AutocompleteInput from '@src/components/ui/AutocompleteInput'
 import tipImage from '@src/components/ui/Dropdowns/Dropdown/images/tip'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'

src/components/ui/Dropdowns/Dropdown/Dropdown.tsx

@@ -18,7 +18,7 @@ import styled, { css } from 'styled-components'
 import ReactDOM from 'react-dom'
 import autobind from 'autobind-decorator'
 
-import DropdownButton from '@src/components/ui/Dropdowns/DropdownButton/DropdownButton'
+import DropdownButton from '@src/components/ui/Dropdowns/DropdownButton'
 
 import { ThemePalette, ThemeProps } from '@src/components/Theme'
 import DomUtils from '@src/utils/DomUtils'