diff --git a/ui/src/Layout.tsx b/ui/src/Layout.tsx
index acf5f84..c4ffe7c 100644
--- a/ui/src/Layout.tsx
+++ b/ui/src/Layout.tsx
@@ -11,7 +11,7 @@ import SettingsDialog from './component/SettingsDialog';
 import SnackBarHandler from './snack/SnackBarHandler';
 import * as config from './config';
 import Applications from './application/Applications';
-import Clients from './pages/Clients';
+import Clients from './client/Clients';
 import Login from './pages/Login';
 import Messages from './pages/Messages';
 import Users from './pages/Users';
diff --git a/ui/src/pages/dialog/AddClientDialog.tsx b/ui/src/client/AddClientDialog.tsx
similarity index 100%
rename from ui/src/pages/dialog/AddClientDialog.tsx
rename to ui/src/client/AddClientDialog.tsx
diff --git a/ui/src/stores/ClientStore.ts b/ui/src/client/ClientStore.ts
similarity index 95%
rename from ui/src/stores/ClientStore.ts
rename to ui/src/client/ClientStore.ts
index c264c8b..9acd1f0 100644
--- a/ui/src/stores/ClientStore.ts
+++ b/ui/src/client/ClientStore.ts
@@ -1,4 +1,4 @@
-import {BaseStore} from './BaseStore';
+import {BaseStore} from '../stores/BaseStore';
 import axios from 'axios';
 import * as config from '../config';
 import {action} from 'mobx';
diff --git a/ui/src/pages/Clients.tsx b/ui/src/client/Clients.tsx
similarity index 98%
rename from ui/src/pages/Clients.tsx
rename to ui/src/client/Clients.tsx
index ead68c6..d93a4f4 100644
--- a/ui/src/pages/Clients.tsx
+++ b/ui/src/client/Clients.tsx
@@ -11,7 +11,7 @@ import React, {Component, SFC} from 'react';
 import ConfirmDialog from '../component/ConfirmDialog';
 import DefaultPage from '../component/DefaultPage';
 import ToggleVisibility from '../component/ToggleVisibility';
-import AddClientDialog from './dialog/AddClientDialog';
+import AddClientDialog from './AddClientDialog';
 import {observer} from 'mobx-react';
 import {observable} from 'mobx';
 import {inject, Stores} from '../inject';
diff --git a/ui/src/index.tsx b/ui/src/index.tsx
index c8c72cd..5ffe736 100644
--- a/ui/src/index.tsx
+++ b/ui/src/index.tsx
@@ -15,7 +15,7 @@ import {SnackManager} from './snack/SnackManager';
 import {InjectProvider, StoreMapping} from './inject';
 import {UserStore} from './stores/UserStore';
 import {MessagesStore} from './stores/MessagesStore';
-import {ClientStore} from './stores/ClientStore';
+import {ClientStore} from './client/ClientStore';
 
 const defaultDevConfig = {
     url: 'http://localhost:80/',
diff --git a/ui/src/inject.tsx b/ui/src/inject.tsx
index 907914c..32bfc30 100644
--- a/ui/src/inject.tsx
+++ b/ui/src/inject.tsx
@@ -3,7 +3,7 @@ import {UserStore} from './stores/UserStore';
 import {SnackManager} from './snack/SnackManager';
 import {MessagesStore} from './stores/MessagesStore';
 import {CurrentUser} from './stores/CurrentUser';
-import {ClientStore} from './stores/ClientStore';
+import {ClientStore} from './client/ClientStore';
 import {AppStore} from './application/AppStore';
 import {inject as mobxInject, Provider} from 'mobx-react';
 import {WebSocketStore} from './stores/WebSocketStore';