diff --git a/ui/src/application/Applications.tsx b/ui/src/application/Applications.tsx
index 5ca9ade..273717b 100644
--- a/ui/src/application/Applications.tsx
+++ b/ui/src/application/Applications.tsx
@@ -10,9 +10,9 @@ import TableRow from '@material-ui/core/TableRow';
 import Delete from '@material-ui/icons/Delete';
 import Edit from '@material-ui/icons/Edit';
 import React, {ChangeEvent, Component, SFC} from 'react';
-import ConfirmDialog from '../component/ConfirmDialog';
-import DefaultPage from '../component/DefaultPage';
-import ToggleVisibility from '../component/ToggleVisibility';
+import ConfirmDialog from '../common/ConfirmDialog';
+import DefaultPage from '../common/DefaultPage';
+import ToggleVisibility from '../common/ToggleVisibility';
 import AddApplicationDialog from './AddApplicationDialog';
 import {observer} from 'mobx-react';
 import {observable} from 'mobx';
diff --git a/ui/src/client/Clients.tsx b/ui/src/client/Clients.tsx
index d93a4f4..00798e2 100644
--- a/ui/src/client/Clients.tsx
+++ b/ui/src/client/Clients.tsx
@@ -8,9 +8,9 @@ import TableHead from '@material-ui/core/TableHead';
 import TableRow from '@material-ui/core/TableRow';
 import Delete from '@material-ui/icons/Delete';
 import React, {Component, SFC} from 'react';
-import ConfirmDialog from '../component/ConfirmDialog';
-import DefaultPage from '../component/DefaultPage';
-import ToggleVisibility from '../component/ToggleVisibility';
+import ConfirmDialog from '../common/ConfirmDialog';
+import DefaultPage from '../common/DefaultPage';
+import ToggleVisibility from '../common/ToggleVisibility';
 import AddClientDialog from './AddClientDialog';
 import {observer} from 'mobx-react';
 import {observable} from 'mobx';
diff --git a/ui/src/component/ConfirmDialog.tsx b/ui/src/common/ConfirmDialog.tsx
similarity index 100%
rename from ui/src/component/ConfirmDialog.tsx
rename to ui/src/common/ConfirmDialog.tsx
diff --git a/ui/src/component/Container.tsx b/ui/src/common/Container.tsx
similarity index 100%
rename from ui/src/component/Container.tsx
rename to ui/src/common/Container.tsx
diff --git a/ui/src/component/DefaultPage.tsx b/ui/src/common/DefaultPage.tsx
similarity index 100%
rename from ui/src/component/DefaultPage.tsx
rename to ui/src/common/DefaultPage.tsx
diff --git a/ui/src/component/LoadingSpinner.tsx b/ui/src/common/LoadingSpinner.tsx
similarity index 100%
rename from ui/src/component/LoadingSpinner.tsx
rename to ui/src/common/LoadingSpinner.tsx
diff --git a/ui/src/component/ScrollUpButton.tsx b/ui/src/common/ScrollUpButton.tsx
similarity index 100%
rename from ui/src/component/ScrollUpButton.tsx
rename to ui/src/common/ScrollUpButton.tsx
diff --git a/ui/src/component/SettingsDialog.tsx b/ui/src/common/SettingsDialog.tsx
similarity index 100%
rename from ui/src/component/SettingsDialog.tsx
rename to ui/src/common/SettingsDialog.tsx
diff --git a/ui/src/component/ToggleVisibility.tsx b/ui/src/common/ToggleVisibility.tsx
similarity index 100%
rename from ui/src/component/ToggleVisibility.tsx
rename to ui/src/common/ToggleVisibility.tsx
diff --git a/ui/src/layout/Layout.tsx b/ui/src/layout/Layout.tsx
index 1b6163c..86cfa7c 100644
--- a/ui/src/layout/Layout.tsx
+++ b/ui/src/layout/Layout.tsx
@@ -4,10 +4,10 @@ import axios, {AxiosResponse} from 'axios';
 import * as React from 'react';
 import {HashRouter, Redirect, Route, Switch} from 'react-router-dom';
 import Header from './Header';
-import LoadingSpinner from '../component/LoadingSpinner';
+import LoadingSpinner from '../common/LoadingSpinner';
 import Navigation from './Navigation';
-import ScrollUpButton from '../component/ScrollUpButton';
-import SettingsDialog from '../component/SettingsDialog';
+import ScrollUpButton from '../common/ScrollUpButton';
+import SettingsDialog from '../common/SettingsDialog';
 import SnackBarHandler from '../snack/SnackBarHandler';
 import * as config from '../config';
 import Applications from '../application/Applications';
diff --git a/ui/src/message/Message.tsx b/ui/src/message/Message.tsx
index 8a51b49..2802c2c 100644
--- a/ui/src/message/Message.tsx
+++ b/ui/src/message/Message.tsx
@@ -4,7 +4,7 @@ import Typography from '@material-ui/core/Typography';
 import Delete from '@material-ui/icons/Delete';
 import React from 'react';
 import TimeAgo from 'react-timeago';
-import Container from '../component/Container';
+import Container from '../common/Container';
 
 const styles = () => ({
     header: {
diff --git a/ui/src/message/Messages.tsx b/ui/src/message/Messages.tsx
index 534c10b..cf9d953 100644
--- a/ui/src/message/Messages.tsx
+++ b/ui/src/message/Messages.tsx
@@ -3,7 +3,7 @@ import Grid from '@material-ui/core/Grid';
 import Typography from '@material-ui/core/Typography';
 import React, {Component} from 'react';
 import {RouteComponentProps} from 'react-router';
-import DefaultPage from '../component/DefaultPage';
+import DefaultPage from '../common/DefaultPage';
 import Message from './Message';
 import {observer} from 'mobx-react';
 // @ts-ignore
diff --git a/ui/src/pages/Login.tsx b/ui/src/pages/Login.tsx
index 8f8c2d5..825ed14 100644
--- a/ui/src/pages/Login.tsx
+++ b/ui/src/pages/Login.tsx
@@ -2,8 +2,8 @@ import Button from '@material-ui/core/Button';
 import Grid from '@material-ui/core/Grid';
 import TextField from '@material-ui/core/TextField';
 import React, {Component, FormEvent} from 'react';
-import Container from '../component/Container';
-import DefaultPage from '../component/DefaultPage';
+import Container from '../common/Container';
+import DefaultPage from '../common/DefaultPage';
 import {observable} from 'mobx';
 import {observer} from 'mobx-react';
 import {inject, Stores} from '../inject';
diff --git a/ui/src/user/Users.tsx b/ui/src/user/Users.tsx
index 0cde7ad..1792f17 100644
--- a/ui/src/user/Users.tsx
+++ b/ui/src/user/Users.tsx
@@ -10,8 +10,8 @@ import TableRow from '@material-ui/core/TableRow';
 import Delete from '@material-ui/icons/Delete';
 import Edit from '@material-ui/icons/Edit';
 import React, {Component, SFC} from 'react';
-import ConfirmDialog from '../component/ConfirmDialog';
-import DefaultPage from '../component/DefaultPage';
+import ConfirmDialog from '../common/ConfirmDialog';
+import DefaultPage from '../common/DefaultPage';
 import AddEditDialog from './AddEditUserDialog';
 import {observer} from 'mobx-react';
 import {observable} from 'mobx';