diff --git a/ui/src/Layout.tsx b/ui/src/Layout.tsx
index 18bf667..020f772 100644
--- a/ui/src/Layout.tsx
+++ b/ui/src/Layout.tsx
@@ -14,7 +14,7 @@ import Applications from './application/Applications';
 import Clients from './client/Clients';
 import Login from './pages/Login';
 import Messages from './message/Messages';
-import Users from './pages/Users';
+import Users from './user/Users';
 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 1405e09..7a62624 100644
--- a/ui/src/index.tsx
+++ b/ui/src/index.tsx
@@ -13,7 +13,7 @@ import {reaction} from 'mobx';
 import {WebSocketStore} from './message/WebSocketStore';
 import {SnackManager} from './snack/SnackManager';
 import {InjectProvider, StoreMapping} from './inject';
-import {UserStore} from './stores/UserStore';
+import {UserStore} from './user/UserStore';
 import {MessagesStore} from './message/MessagesStore';
 import {ClientStore} from './client/ClientStore';
 
diff --git a/ui/src/inject.tsx b/ui/src/inject.tsx
index 989cf9c..9fa6ad9 100644
--- a/ui/src/inject.tsx
+++ b/ui/src/inject.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {UserStore} from './stores/UserStore';
+import {UserStore} from './user/UserStore';
 import {SnackManager} from './snack/SnackManager';
 import {MessagesStore} from './message/MessagesStore';
 import {CurrentUser} from './stores/CurrentUser';
diff --git a/ui/src/pages/dialog/AddEditUserDialog.tsx b/ui/src/user/AddEditUserDialog.tsx
similarity index 100%
rename from ui/src/pages/dialog/AddEditUserDialog.tsx
rename to ui/src/user/AddEditUserDialog.tsx
diff --git a/ui/src/stores/UserStore.ts b/ui/src/user/UserStore.ts
similarity index 96%
rename from ui/src/stores/UserStore.ts
rename to ui/src/user/UserStore.ts
index 38d3f14..1b2eae9 100644
--- a/ui/src/stores/UserStore.ts
+++ b/ui/src/user/UserStore.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/Users.tsx b/ui/src/user/Users.tsx
similarity index 98%
rename from ui/src/pages/Users.tsx
rename to ui/src/user/Users.tsx
index b5b1b13..0cde7ad 100644
--- a/ui/src/pages/Users.tsx
+++ b/ui/src/user/Users.tsx
@@ -12,7 +12,7 @@ import Edit from '@material-ui/icons/Edit';
 import React, {Component, SFC} from 'react';
 import ConfirmDialog from '../component/ConfirmDialog';
 import DefaultPage from '../component/DefaultPage';
-import AddEditDialog from './dialog/AddEditUserDialog';
+import AddEditDialog from './AddEditUserDialog';
 import {observer} from 'mobx-react';
 import {observable} from 'mobx';
 import {inject, Stores} from '../inject';