diff --git a/zyrarbot/application.py b/zyrarbot/application.py
index 45ca9f1..368b569 100644
--- a/zyrarbot/application.py
+++ b/zyrarbot/application.py
@@ -7,8 +7,8 @@ import uvicorn
 
 from zyrarbot.audio.media_probe import MediaProbe
 from zyrarbot.audio.track_factory import TrackFactory
-from zyrarbot.bot.client import MusicBot
-from zyrarbot.bot.guild_resolver import GuildResolver
+from zyrarbot.ui.bot.client import MusicBot
+from zyrarbot.ui.bot.guild_resolver import GuildResolver
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.music.notification_channel_resolver import NotificationChannelResolver
 from zyrarbot.music.track_embed_factory import TrackEmbedFactory
@@ -17,7 +17,7 @@ from zyrarbot.storage.guild_config_repository import GuildConfigRepository
 from zyrarbot.storage.history_repository import HistoryRepository
 from zyrarbot.storage.json_file_store import JsonFileStore
 from zyrarbot.storage.uploads_repository import UploadsRepository
-from zyrarbot.web.factory import create_app
+from zyrarbot.ui.web.factory import create_app
 
 logger = logging.getLogger(__name__)
 
diff --git a/zyrarbot/ui/__init__.py b/zyrarbot/ui/__init__.py
new file mode 100644
index 0000000..e16766e
--- /dev/null
+++ b/zyrarbot/ui/__init__.py
@@ -0,0 +1 @@
+"""Komunikacja użytkownika z odtwarzaczem"""
\ No newline at end of file
diff --git a/zyrarbot/bot/__init__.py b/zyrarbot/ui/bot/__init__.py
similarity index 100%
rename from zyrarbot/bot/__init__.py
rename to zyrarbot/ui/bot/__init__.py
diff --git a/zyrarbot/bot/client.py b/zyrarbot/ui/bot/client.py
similarity index 97%
rename from zyrarbot/bot/client.py
rename to zyrarbot/ui/bot/client.py
index a6dc4e5..7f45b9e 100644
--- a/zyrarbot/bot/client.py
+++ b/zyrarbot/ui/bot/client.py
@@ -6,7 +6,7 @@ import discord
 from discord.ext import commands
 
 from zyrarbot.audio.track_factory import TrackFactory
-from zyrarbot.bot.cogs.music_cog import MusicCog
+from zyrarbot.ui.bot.cogs.music_cog import MusicCog
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.settings import Settings
 from zyrarbot.storage.uploads_repository import UploadsRepository
diff --git a/zyrarbot/bot/cogs/__init__.py b/zyrarbot/ui/bot/cogs/__init__.py
similarity index 100%
rename from zyrarbot/bot/cogs/__init__.py
rename to zyrarbot/ui/bot/cogs/__init__.py
diff --git a/zyrarbot/bot/cogs/music_cog.py b/zyrarbot/ui/bot/cogs/music_cog.py
similarity index 100%
rename from zyrarbot/bot/cogs/music_cog.py
rename to zyrarbot/ui/bot/cogs/music_cog.py
diff --git a/zyrarbot/bot/guild_resolver.py b/zyrarbot/ui/bot/guild_resolver.py
similarity index 100%
rename from zyrarbot/bot/guild_resolver.py
rename to zyrarbot/ui/bot/guild_resolver.py
diff --git a/zyrarbot/web/__init__.py b/zyrarbot/ui/web/__init__.py
similarity index 100%
rename from zyrarbot/web/__init__.py
rename to zyrarbot/ui/web/__init__.py
diff --git a/zyrarbot/web/connection_manager.py b/zyrarbot/ui/web/connection_manager.py
similarity index 100%
rename from zyrarbot/web/connection_manager.py
rename to zyrarbot/ui/web/connection_manager.py
diff --git a/zyrarbot/web/dependencies.py b/zyrarbot/ui/web/dependencies.py
similarity index 87%
rename from zyrarbot/web/dependencies.py
rename to zyrarbot/ui/web/dependencies.py
index 6965cae..5894ac8 100644
--- a/zyrarbot/web/dependencies.py
+++ b/zyrarbot/ui/web/dependencies.py
@@ -4,14 +4,14 @@ import discord
 from fastapi import HTTPException, Request, WebSocket
 
 from zyrarbot.audio.track_factory import TrackFactory
-from zyrarbot.bot.guild_resolver import GuildResolver
+from zyrarbot.ui.bot.guild_resolver import GuildResolver
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.settings import Settings
 from zyrarbot.storage.guild_config_repository import GuildConfigRepository
 from zyrarbot.storage.uploads_repository import UploadsRepository
-from zyrarbot.web.connection_manager import ConnectionManager
-from zyrarbot.web.status_broadcaster import StatusBroadcaster
-from zyrarbot.web.status_service import StatusService
+from zyrarbot.ui.web.connection_manager import ConnectionManager
+from zyrarbot.ui.web.status_broadcaster import StatusBroadcaster
+from zyrarbot.ui.web.status_service import StatusService
 
 NO_GUILD_DETAIL = "Bot has no active server context"
 
diff --git a/zyrarbot/web/factory.py b/zyrarbot/ui/web/factory.py
similarity index 89%
rename from zyrarbot/web/factory.py
rename to zyrarbot/ui/web/factory.py
index 9c5ac31..77257ec 100644
--- a/zyrarbot/web/factory.py
+++ b/zyrarbot/ui/web/factory.py
@@ -9,13 +9,13 @@ from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
 
 from zyrarbot.audio.track_factory import TrackFactory
-from zyrarbot.bot.guild_resolver import GuildResolver
+from zyrarbot.ui.bot.guild_resolver import GuildResolver
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.settings import Settings
 from zyrarbot.storage.guild_config_repository import GuildConfigRepository
 from zyrarbot.storage.uploads_repository import UploadsRepository
-from zyrarbot.web.connection_manager import ConnectionManager
-from zyrarbot.web.routers import (
+from zyrarbot.ui.web.connection_manager import ConnectionManager
+from zyrarbot.ui.web.routers import (
     playback_router,
     queue_router,
     settings_router,
@@ -24,8 +24,8 @@ from zyrarbot.web.routers import (
     voice_router,
     websocket_router,
 )
-from zyrarbot.web.status_broadcaster import StatusBroadcaster
-from zyrarbot.web.status_service import StatusService
+from zyrarbot.ui.web.status_broadcaster import StatusBroadcaster
+from zyrarbot.ui.web.status_service import StatusService
 
 logger = logging.getLogger(__name__)
 
diff --git a/zyrarbot/web/routers/__init__.py b/zyrarbot/ui/web/routers/__init__.py
similarity index 100%
rename from zyrarbot/web/routers/__init__.py
rename to zyrarbot/ui/web/routers/__init__.py
diff --git a/zyrarbot/web/routers/playback_router.py b/zyrarbot/ui/web/routers/playback_router.py
similarity index 94%
rename from zyrarbot/web/routers/playback_router.py
rename to zyrarbot/ui/web/routers/playback_router.py
index 221d204..d4329ab 100644
--- a/zyrarbot/web/routers/playback_router.py
+++ b/zyrarbot/ui/web/routers/playback_router.py
@@ -10,18 +10,18 @@ from zyrarbot.audio.track_factory import TrackFactory
 from zyrarbot.music.loop_mode import LoopMode
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.storage.uploads_repository import UploadsRepository
-from zyrarbot.web.dependencies import (
+from zyrarbot.ui.web.dependencies import (
     get_active_guild,
     get_broadcaster,
     get_player,
     get_tracks,
     get_uploads,
 )
-from zyrarbot.web.schemas.loop_request import LoopRequest
-from zyrarbot.web.schemas.play_file_request import PlayFileRequest
-from zyrarbot.web.schemas.play_request import PlayRequest
-from zyrarbot.web.schemas.volume_request import VolumeRequest
-from zyrarbot.web.status_broadcaster import StatusBroadcaster
+from zyrarbot.ui.web.schemas.loop_request import LoopRequest
+from zyrarbot.ui.web.schemas.play_file_request import PlayFileRequest
+from zyrarbot.ui.web.schemas.play_request import PlayRequest
+from zyrarbot.ui.web.schemas.volume_request import VolumeRequest
+from zyrarbot.ui.web.status_broadcaster import StatusBroadcaster
 
 logger = logging.getLogger(__name__)
 
diff --git a/zyrarbot/web/routers/queue_router.py b/zyrarbot/ui/web/routers/queue_router.py
similarity index 86%
rename from zyrarbot/web/routers/queue_router.py
rename to zyrarbot/ui/web/routers/queue_router.py
index 8c06886..3b6fc82 100644
--- a/zyrarbot/web/routers/queue_router.py
+++ b/zyrarbot/ui/web/routers/queue_router.py
@@ -7,17 +7,17 @@ from fastapi import APIRouter, Depends, HTTPException
 
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.settings import Settings
-from zyrarbot.web.dependencies import (
+from zyrarbot.ui.web.dependencies import (
     get_active_guild,
     get_broadcaster,
     get_player,
     get_settings,
 )
-from zyrarbot.web.schemas.jump_request import JumpRequest
-from zyrarbot.web.schemas.remove_request import RemoveRequest
-from zyrarbot.web.schemas.reorder_request import ReorderRequest
-from zyrarbot.web.schemas.track_plays_request import TrackPlaysRequest
-from zyrarbot.web.status_broadcaster import StatusBroadcaster
+from zyrarbot.ui.web.schemas.jump_request import JumpRequest
+from zyrarbot.ui.web.schemas.remove_request import RemoveRequest
+from zyrarbot.ui.web.schemas.reorder_request import ReorderRequest
+from zyrarbot.ui.web.schemas.track_plays_request import TrackPlaysRequest
+from zyrarbot.ui.web.status_broadcaster import StatusBroadcaster
 
 router = APIRouter(prefix="/api", tags=["queue"])
 
diff --git a/zyrarbot/web/routers/settings_router.py b/zyrarbot/ui/web/routers/settings_router.py
similarity index 89%
rename from zyrarbot/web/routers/settings_router.py
rename to zyrarbot/ui/web/routers/settings_router.py
index ea5ce46..eca9599 100644
--- a/zyrarbot/web/routers/settings_router.py
+++ b/zyrarbot/ui/web/routers/settings_router.py
@@ -6,20 +6,20 @@ from typing import Any
 import discord
 from fastapi import APIRouter, Depends, HTTPException
 
-from zyrarbot.bot.guild_resolver import GuildResolver
+from zyrarbot.ui.bot.guild_resolver import GuildResolver
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.settings import Settings
 from zyrarbot.storage.guild_config_repository import GuildConfigRepository
-from zyrarbot.web.dependencies import (
+from zyrarbot.ui.web.dependencies import (
     get_broadcaster,
     get_config,
     get_guilds,
     get_player,
     get_settings,
 )
-from zyrarbot.web.schemas.default_plays_request import DefaultPlaysRequest
-from zyrarbot.web.schemas.text_channel_request import TextChannelRequest
-from zyrarbot.web.status_broadcaster import StatusBroadcaster
+from zyrarbot.ui.web.schemas.default_plays_request import DefaultPlaysRequest
+from zyrarbot.ui.web.schemas.text_channel_request import TextChannelRequest
+from zyrarbot.ui.web.status_broadcaster import StatusBroadcaster
 
 logger = logging.getLogger(__name__)
 
diff --git a/zyrarbot/web/routers/status_router.py b/zyrarbot/ui/web/routers/status_router.py
similarity index 71%
rename from zyrarbot/web/routers/status_router.py
rename to zyrarbot/ui/web/routers/status_router.py
index 9d40d4f..6d10bdd 100644
--- a/zyrarbot/web/routers/status_router.py
+++ b/zyrarbot/ui/web/routers/status_router.py
@@ -4,8 +4,8 @@ from typing import Any
 
 from fastapi import APIRouter, Depends
 
-from zyrarbot.web.dependencies import get_status_service
-from zyrarbot.web.status_service import StatusService
+from zyrarbot.ui.web.dependencies import get_status_service
+from zyrarbot.ui.web.status_service import StatusService
 
 router = APIRouter(prefix="/api", tags=["status"])
 
diff --git a/zyrarbot/web/routers/uploads_router.py b/zyrarbot/ui/web/routers/uploads_router.py
similarity index 96%
rename from zyrarbot/web/routers/uploads_router.py
rename to zyrarbot/ui/web/routers/uploads_router.py
index 9dc7f99..fc32bf6 100644
--- a/zyrarbot/web/routers/uploads_router.py
+++ b/zyrarbot/ui/web/routers/uploads_router.py
@@ -5,7 +5,7 @@ from typing import Any
 from fastapi import APIRouter, Depends, File, HTTPException, UploadFile
 
 from zyrarbot.storage.uploads_repository import UploadsRepository
-from zyrarbot.web.dependencies import get_uploads
+from zyrarbot.ui.web.dependencies import get_uploads
 
 router = APIRouter(prefix="/api", tags=["uploads"])
 
diff --git a/zyrarbot/web/routers/voice_router.py b/zyrarbot/ui/web/routers/voice_router.py
similarity index 89%
rename from zyrarbot/web/routers/voice_router.py
rename to zyrarbot/ui/web/routers/voice_router.py
index 98d6f4a..332c473 100644
--- a/zyrarbot/web/routers/voice_router.py
+++ b/zyrarbot/ui/web/routers/voice_router.py
@@ -3,17 +3,17 @@ from __future__ import annotations
 import discord
 from fastapi import APIRouter, Depends, HTTPException
 
-from zyrarbot.bot.guild_resolver import GuildResolver
+from zyrarbot.ui.bot.guild_resolver import GuildResolver
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.music.notification_channel_resolver import NotificationChannelResolver
-from zyrarbot.web.dependencies import (
+from zyrarbot.ui.web.dependencies import (
     get_active_guild,
     get_broadcaster,
     get_guilds,
     get_player,
 )
-from zyrarbot.web.schemas.connect_request import ConnectRequest
-from zyrarbot.web.status_broadcaster import StatusBroadcaster
+from zyrarbot.ui.web.schemas.connect_request import ConnectRequest
+from zyrarbot.ui.web.status_broadcaster import StatusBroadcaster
 
 router = APIRouter(prefix="/api", tags=["voice"])
 
diff --git a/zyrarbot/web/routers/websocket_router.py b/zyrarbot/ui/web/routers/websocket_router.py
similarity index 80%
rename from zyrarbot/web/routers/websocket_router.py
rename to zyrarbot/ui/web/routers/websocket_router.py
index 3da3492..af126b8 100644
--- a/zyrarbot/web/routers/websocket_router.py
+++ b/zyrarbot/ui/web/routers/websocket_router.py
@@ -4,9 +4,9 @@ import logging
 
 from fastapi import APIRouter, Depends, WebSocket, WebSocketDisconnect
 
-from zyrarbot.web.connection_manager import ConnectionManager
-from zyrarbot.web.dependencies import get_connections, get_socket_status_service
-from zyrarbot.web.status_service import StatusService
+from zyrarbot.ui.web.connection_manager import ConnectionManager
+from zyrarbot.ui.web.dependencies import get_connections, get_socket_status_service
+from zyrarbot.ui.web.status_service import StatusService
 
 logger = logging.getLogger(__name__)
 
diff --git a/zyrarbot/web/schemas/__init__.py b/zyrarbot/ui/web/schemas/__init__.py
similarity index 100%
rename from zyrarbot/web/schemas/__init__.py
rename to zyrarbot/ui/web/schemas/__init__.py
diff --git a/zyrarbot/web/schemas/connect_request.py b/zyrarbot/ui/web/schemas/connect_request.py
similarity index 100%
rename from zyrarbot/web/schemas/connect_request.py
rename to zyrarbot/ui/web/schemas/connect_request.py
diff --git a/zyrarbot/web/schemas/default_plays_request.py b/zyrarbot/ui/web/schemas/default_plays_request.py
similarity index 100%
rename from zyrarbot/web/schemas/default_plays_request.py
rename to zyrarbot/ui/web/schemas/default_plays_request.py
diff --git a/zyrarbot/web/schemas/jump_request.py b/zyrarbot/ui/web/schemas/jump_request.py
similarity index 100%
rename from zyrarbot/web/schemas/jump_request.py
rename to zyrarbot/ui/web/schemas/jump_request.py
diff --git a/zyrarbot/web/schemas/loop_request.py b/zyrarbot/ui/web/schemas/loop_request.py
similarity index 100%
rename from zyrarbot/web/schemas/loop_request.py
rename to zyrarbot/ui/web/schemas/loop_request.py
diff --git a/zyrarbot/web/schemas/play_file_request.py b/zyrarbot/ui/web/schemas/play_file_request.py
similarity index 100%
rename from zyrarbot/web/schemas/play_file_request.py
rename to zyrarbot/ui/web/schemas/play_file_request.py
diff --git a/zyrarbot/web/schemas/play_request.py b/zyrarbot/ui/web/schemas/play_request.py
similarity index 100%
rename from zyrarbot/web/schemas/play_request.py
rename to zyrarbot/ui/web/schemas/play_request.py
diff --git a/zyrarbot/web/schemas/remove_request.py b/zyrarbot/ui/web/schemas/remove_request.py
similarity index 100%
rename from zyrarbot/web/schemas/remove_request.py
rename to zyrarbot/ui/web/schemas/remove_request.py
diff --git a/zyrarbot/web/schemas/reorder_request.py b/zyrarbot/ui/web/schemas/reorder_request.py
similarity index 100%
rename from zyrarbot/web/schemas/reorder_request.py
rename to zyrarbot/ui/web/schemas/reorder_request.py
diff --git a/zyrarbot/web/schemas/text_channel_request.py b/zyrarbot/ui/web/schemas/text_channel_request.py
similarity index 100%
rename from zyrarbot/web/schemas/text_channel_request.py
rename to zyrarbot/ui/web/schemas/text_channel_request.py
diff --git a/zyrarbot/web/schemas/track_plays_request.py b/zyrarbot/ui/web/schemas/track_plays_request.py
similarity index 100%
rename from zyrarbot/web/schemas/track_plays_request.py
rename to zyrarbot/ui/web/schemas/track_plays_request.py
diff --git a/zyrarbot/web/schemas/volume_request.py b/zyrarbot/ui/web/schemas/volume_request.py
similarity index 100%
rename from zyrarbot/web/schemas/volume_request.py
rename to zyrarbot/ui/web/schemas/volume_request.py
diff --git a/zyrarbot/web/status_broadcaster.py b/zyrarbot/ui/web/status_broadcaster.py
similarity index 92%
rename from zyrarbot/web/status_broadcaster.py
rename to zyrarbot/ui/web/status_broadcaster.py
index 73b548d..a39833e 100644
--- a/zyrarbot/web/status_broadcaster.py
+++ b/zyrarbot/ui/web/status_broadcaster.py
@@ -4,8 +4,8 @@ import asyncio
 import contextlib
 import logging
 
-from zyrarbot.web.connection_manager import ConnectionManager
-from zyrarbot.web.status_service import StatusService
+from zyrarbot.ui.web.connection_manager import ConnectionManager
+from zyrarbot.ui.web.status_service import StatusService
 
 logger = logging.getLogger(__name__)
 
diff --git a/zyrarbot/web/status_service.py b/zyrarbot/ui/web/status_service.py
similarity index 98%
rename from zyrarbot/web/status_service.py
rename to zyrarbot/ui/web/status_service.py
index 2de4754..844c491 100644
--- a/zyrarbot/web/status_service.py
+++ b/zyrarbot/ui/web/status_service.py
@@ -5,7 +5,7 @@ from typing import Any
 import discord
 
 from zyrarbot.audio.ytdl_source import YTDLSource
-from zyrarbot.bot.guild_resolver import GuildResolver
+from zyrarbot.ui.bot.guild_resolver import GuildResolver
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.music.notification_channel_resolver import NotificationChannelResolver