diff --git a/ui/src/Layout.tsx b/ui/src/Layout.tsx
index 5ae9591..643b1df 100644
--- a/ui/src/Layout.tsx
+++ b/ui/src/Layout.tsx
@@ -8,7 +8,7 @@ import LoadingSpinner from './component/LoadingSpinner';
 import Navigation from './component/Navigation';
 import ScrollUpButton from './component/ScrollUpButton';
 import SettingsDialog from './component/SettingsDialog';
-import SnackBarHandler from './component/SnackBarHandler';
+import SnackBarHandler from './snack/SnackBarHandler';
 import * as config from './config';
 import Applications from './pages/Applications';
 import Clients from './pages/Clients';
diff --git a/ui/src/actions/axios.ts b/ui/src/actions/axios.ts
index d6272eb..5cb6efa 100644
--- a/ui/src/actions/axios.ts
+++ b/ui/src/actions/axios.ts
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import {CurrentUser} from '../stores/CurrentUser';
-import {SnackReporter} from '../stores/SnackManager';
+import {SnackReporter} from '../snack/SnackManager';
 
 export const initAxios = (currentUser: CurrentUser, snack: SnackReporter) => {
     axios.interceptors.request.use((config) => {
diff --git a/ui/src/index.tsx b/ui/src/index.tsx
index 7b631a1..c26bc4a 100644
--- a/ui/src/index.tsx
+++ b/ui/src/index.tsx
@@ -11,7 +11,7 @@ import {CurrentUser} from './stores/CurrentUser';
 import {AppStore} from './stores/AppStore';
 import {reaction} from 'mobx';
 import {WebSocketStore} from './stores/WebSocketStore';
-import {SnackManager} from './stores/SnackManager';
+import {SnackManager} from './snack/SnackManager';
 import {InjectProvider, StoreMapping} from './inject';
 import {UserStore} from './stores/UserStore';
 import {MessagesStore} from './stores/MessagesStore';
diff --git a/ui/src/inject.tsx b/ui/src/inject.tsx
index 64ac887..aa15315 100644
--- a/ui/src/inject.tsx
+++ b/ui/src/inject.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import {UserStore} from './stores/UserStore';
-import {SnackManager} from './stores/SnackManager';
+import {SnackManager} from './snack/SnackManager';
 import {MessagesStore} from './stores/MessagesStore';
 import {CurrentUser} from './stores/CurrentUser';
 import {ClientStore} from './stores/ClientStore';
diff --git a/ui/src/component/SnackBarHandler.tsx b/ui/src/snack/SnackBarHandler.tsx
similarity index 100%
rename from ui/src/component/SnackBarHandler.tsx
rename to ui/src/snack/SnackBarHandler.tsx
diff --git a/ui/src/stores/SnackManager.ts b/ui/src/snack/SnackManager.ts
similarity index 100%
rename from ui/src/stores/SnackManager.ts
rename to ui/src/snack/SnackManager.ts
diff --git a/ui/src/stores/AppStore.ts b/ui/src/stores/AppStore.ts
index 793fbf8..80cc01b 100644
--- a/ui/src/stores/AppStore.ts
+++ b/ui/src/stores/AppStore.ts
@@ -2,7 +2,7 @@ import {BaseStore} from './BaseStore';
 import axios from 'axios';
 import * as config from '../config';
 import {action} from 'mobx';
-import {SnackReporter} from './SnackManager';
+import {SnackReporter} from '../snack/SnackManager';
 
 export class AppStore extends BaseStore<IApplication> {
     public constructor(private readonly snack: SnackReporter) {
diff --git a/ui/src/stores/ClientStore.ts b/ui/src/stores/ClientStore.ts
index 8e76abd..c264c8b 100644
--- a/ui/src/stores/ClientStore.ts
+++ b/ui/src/stores/ClientStore.ts
@@ -2,7 +2,7 @@ import {BaseStore} from './BaseStore';
 import axios from 'axios';
 import * as config from '../config';
 import {action} from 'mobx';
-import {SnackReporter} from './SnackManager';
+import {SnackReporter} from '../snack/SnackManager';
 
 export class ClientStore extends BaseStore<IClient> {
     public constructor(private readonly snack: SnackReporter) {
diff --git a/ui/src/stores/CurrentUser.ts b/ui/src/stores/CurrentUser.ts
index 03b4d02..2fb3017 100644
--- a/ui/src/stores/CurrentUser.ts
+++ b/ui/src/stores/CurrentUser.ts
@@ -1,7 +1,7 @@
 import axios, {AxiosResponse} from 'axios';
 import * as config from '../config';
 import {detect} from 'detect-browser';
-import {SnackReporter} from './SnackManager';
+import {SnackReporter} from '../snack/SnackManager';
 import {observable} from 'mobx';
 
 const tokenKey = 'gotify-login-key';
diff --git a/ui/src/stores/MessagesStore.ts b/ui/src/stores/MessagesStore.ts
index 2986e3b..f248a2b 100644
--- a/ui/src/stores/MessagesStore.ts
+++ b/ui/src/stores/MessagesStore.ts
@@ -3,7 +3,7 @@ import {action, IObservableArray, observable, reaction} from 'mobx';
 import axios, {AxiosResponse} from 'axios';
 import * as config from '../config';
 import {createTransformer} from 'mobx-utils';
-import {SnackReporter} from './SnackManager';
+import {SnackReporter} from '../snack/SnackManager';
 
 const AllMessages = -1;
 
diff --git a/ui/src/stores/UserStore.ts b/ui/src/stores/UserStore.ts
index c3e7882..38d3f14 100644
--- a/ui/src/stores/UserStore.ts
+++ b/ui/src/stores/UserStore.ts
@@ -2,7 +2,7 @@ import {BaseStore} from './BaseStore';
 import axios from 'axios';
 import * as config from '../config';
 import {action} from 'mobx';
-import {SnackReporter} from './SnackManager';
+import {SnackReporter} from '../snack/SnackManager';
 
 export class UserStore extends BaseStore<IUser> {
     constructor(private readonly snack: SnackReporter) {
diff --git a/ui/src/stores/WebSocketStore.ts b/ui/src/stores/WebSocketStore.ts
index e8ebb82..7d33262 100644
--- a/ui/src/stores/WebSocketStore.ts
+++ b/ui/src/stores/WebSocketStore.ts
@@ -1,4 +1,4 @@
-import {SnackReporter} from './SnackManager';
+import {SnackReporter} from '../snack/SnackManager';
 import {CurrentUser} from './CurrentUser';
 import * as config from '../config';
 import {MessagesStore} from './MessagesStore';