diff --git a/Dockerfile.web b/client-web/Dockerfile
similarity index 100%
rename from Dockerfile.web
rename to client-web/Dockerfile
diff --git a/apps/web/index.html b/client-web/index.html
similarity index 100%
rename from apps/web/index.html
rename to client-web/index.html
diff --git a/apps/web/package.json b/client-web/package.json
similarity index 100%
rename from apps/web/package.json
rename to client-web/package.json
diff --git a/apps/web/public/knot.svg b/client-web/public/knot.svg
similarity index 100%
rename from apps/web/public/knot.svg
rename to client-web/public/knot.svg
diff --git a/apps/web/public/logo.jpg b/client-web/public/logo.jpg
similarity index 100%
rename from apps/web/public/logo.jpg
rename to client-web/public/logo.jpg
diff --git a/apps/web/public/logo.png b/client-web/public/logo.png
similarity index 100%
rename from apps/web/public/logo.png
rename to client-web/public/logo.png
diff --git a/apps/web/public/sounds/abonent_nedostupen.mp3 b/client-web/public/sounds/abonent_nedostupen.mp3
similarity index 100%
rename from apps/web/public/sounds/abonent_nedostupen.mp3
rename to client-web/public/sounds/abonent_nedostupen.mp3
diff --git a/apps/web/public/sounds/call_sound.mp3 b/client-web/public/sounds/call_sound.mp3
similarity index 100%
rename from apps/web/public/sounds/call_sound.mp3
rename to client-web/public/sounds/call_sound.mp3
diff --git a/apps/web/src/App.tsx b/client-web/src/App.tsx
similarity index 100%
rename from apps/web/src/App.tsx
rename to client-web/src/App.tsx
diff --git a/apps/web/src/core/application/stores/notificationStore.ts b/client-web/src/core/application/stores/notificationStore.ts
similarity index 100%
rename from apps/web/src/core/application/stores/notificationStore.ts
rename to client-web/src/core/application/stores/notificationStore.ts
diff --git a/apps/web/src/core/application/stores/themeStore.ts b/client-web/src/core/application/stores/themeStore.ts
similarity index 100%
rename from apps/web/src/core/application/stores/themeStore.ts
rename to client-web/src/core/application/stores/themeStore.ts
diff --git a/apps/web/src/core/domain/types.ts b/client-web/src/core/domain/types.ts
similarity index 100%
rename from apps/web/src/core/domain/types.ts
rename to client-web/src/core/domain/types.ts
diff --git a/apps/web/src/core/infrastructure/appApi.ts b/client-web/src/core/infrastructure/appApi.ts
similarity index 100%
rename from apps/web/src/core/infrastructure/appApi.ts
rename to client-web/src/core/infrastructure/appApi.ts
diff --git a/apps/web/src/core/infrastructure/httpClient.ts b/client-web/src/core/infrastructure/httpClient.ts
similarity index 100%
rename from apps/web/src/core/infrastructure/httpClient.ts
rename to client-web/src/core/infrastructure/httpClient.ts
diff --git a/apps/web/src/core/infrastructure/i18n.ts b/client-web/src/core/infrastructure/i18n.ts
similarity index 100%
rename from apps/web/src/core/infrastructure/i18n.ts
rename to client-web/src/core/infrastructure/i18n.ts
diff --git a/apps/web/src/core/infrastructure/imageCrop.ts b/client-web/src/core/infrastructure/imageCrop.ts
similarity index 100%
rename from apps/web/src/core/infrastructure/imageCrop.ts
rename to client-web/src/core/infrastructure/imageCrop.ts
diff --git a/apps/web/src/core/infrastructure/socket.ts b/client-web/src/core/infrastructure/socket.ts
similarity index 100%
rename from apps/web/src/core/infrastructure/socket.ts
rename to client-web/src/core/infrastructure/socket.ts
diff --git a/apps/web/src/core/presentation/components/ui/Avatar.tsx b/client-web/src/core/presentation/components/ui/Avatar.tsx
similarity index 100%
rename from apps/web/src/core/presentation/components/ui/Avatar.tsx
rename to client-web/src/core/presentation/components/ui/Avatar.tsx
diff --git a/apps/web/src/core/presentation/components/ui/ConfirmModal.tsx b/client-web/src/core/presentation/components/ui/ConfirmModal.tsx
similarity index 100%
rename from apps/web/src/core/presentation/components/ui/ConfirmModal.tsx
rename to client-web/src/core/presentation/components/ui/ConfirmModal.tsx
diff --git a/apps/web/src/core/presentation/components/ui/DatePicker.tsx b/client-web/src/core/presentation/components/ui/DatePicker.tsx
similarity index 100%
rename from apps/web/src/core/presentation/components/ui/DatePicker.tsx
rename to client-web/src/core/presentation/components/ui/DatePicker.tsx
diff --git a/apps/web/src/core/presentation/components/ui/ImageLightbox.tsx b/client-web/src/core/presentation/components/ui/ImageLightbox.tsx
similarity index 100%
rename from apps/web/src/core/presentation/components/ui/ImageLightbox.tsx
rename to client-web/src/core/presentation/components/ui/ImageLightbox.tsx
diff --git a/apps/web/src/core/presentation/components/ui/NotificationProvider.tsx b/client-web/src/core/presentation/components/ui/NotificationProvider.tsx
similarity index 100%
rename from apps/web/src/core/presentation/components/ui/NotificationProvider.tsx
rename to client-web/src/core/presentation/components/ui/NotificationProvider.tsx
diff --git a/apps/web/src/core/presentation/layouts/SideMenu.tsx b/client-web/src/core/presentation/layouts/SideMenu.tsx
similarity index 100%
rename from apps/web/src/core/presentation/layouts/SideMenu.tsx
rename to client-web/src/core/presentation/layouts/SideMenu.tsx
diff --git a/apps/web/src/core/presentation/layouts/Sidebar.tsx b/client-web/src/core/presentation/layouts/Sidebar.tsx
similarity index 100%
rename from apps/web/src/core/presentation/layouts/Sidebar.tsx
rename to client-web/src/core/presentation/layouts/Sidebar.tsx
diff --git a/apps/web/src/core/utils/hooks.ts b/client-web/src/core/utils/hooks.ts
similarity index 100%
rename from apps/web/src/core/utils/hooks.ts
rename to client-web/src/core/utils/hooks.ts
diff --git a/apps/web/src/core/utils/sounds.ts b/client-web/src/core/utils/sounds.ts
similarity index 100%
rename from apps/web/src/core/utils/sounds.ts
rename to client-web/src/core/utils/sounds.ts
diff --git a/apps/web/src/core/utils/utils.ts b/client-web/src/core/utils/utils.ts
similarity index 100%
rename from apps/web/src/core/utils/utils.ts
rename to client-web/src/core/utils/utils.ts
diff --git a/apps/web/src/index.css b/client-web/src/index.css
similarity index 100%
rename from apps/web/src/index.css
rename to client-web/src/index.css
diff --git a/apps/web/src/main.tsx b/client-web/src/main.tsx
similarity index 100%
rename from apps/web/src/main.tsx
rename to client-web/src/main.tsx
diff --git a/apps/web/src/modules/admin/presentation/pages/AdminPage.tsx b/client-web/src/modules/admin/presentation/pages/AdminPage.tsx
similarity index 100%
rename from apps/web/src/modules/admin/presentation/pages/AdminPage.tsx
rename to client-web/src/modules/admin/presentation/pages/AdminPage.tsx
diff --git a/apps/web/src/modules/auth/application/authStore.ts b/client-web/src/modules/auth/application/authStore.ts
similarity index 100%
rename from apps/web/src/modules/auth/application/authStore.ts
rename to client-web/src/modules/auth/application/authStore.ts
diff --git a/apps/web/src/modules/auth/domain/types.ts b/client-web/src/modules/auth/domain/types.ts
similarity index 100%
rename from apps/web/src/modules/auth/domain/types.ts
rename to client-web/src/modules/auth/domain/types.ts
diff --git a/apps/web/src/modules/auth/infrastructure/authApi.ts b/client-web/src/modules/auth/infrastructure/authApi.ts
similarity index 100%
rename from apps/web/src/modules/auth/infrastructure/authApi.ts
rename to client-web/src/modules/auth/infrastructure/authApi.ts
diff --git a/apps/web/src/modules/auth/presentation/AuthPage.tsx b/client-web/src/modules/auth/presentation/AuthPage.tsx
similarity index 100%
rename from apps/web/src/modules/auth/presentation/AuthPage.tsx
rename to client-web/src/modules/auth/presentation/AuthPage.tsx
diff --git a/apps/web/src/modules/auth/presentation/components/LoginForm.tsx b/client-web/src/modules/auth/presentation/components/LoginForm.tsx
similarity index 100%
rename from apps/web/src/modules/auth/presentation/components/LoginForm.tsx
rename to client-web/src/modules/auth/presentation/components/LoginForm.tsx
diff --git a/apps/web/src/modules/auth/presentation/components/RegisterForm.tsx b/client-web/src/modules/auth/presentation/components/RegisterForm.tsx
similarity index 100%
rename from apps/web/src/modules/auth/presentation/components/RegisterForm.tsx
rename to client-web/src/modules/auth/presentation/components/RegisterForm.tsx
diff --git a/apps/web/src/modules/calls/presentation/components/CallModal.tsx b/client-web/src/modules/calls/presentation/components/CallModal.tsx
similarity index 100%
rename from apps/web/src/modules/calls/presentation/components/CallModal.tsx
rename to client-web/src/modules/calls/presentation/components/CallModal.tsx
diff --git a/apps/web/src/modules/calls/presentation/components/GroupCallModal.tsx b/client-web/src/modules/calls/presentation/components/GroupCallModal.tsx
similarity index 100%
rename from apps/web/src/modules/calls/presentation/components/GroupCallModal.tsx
rename to client-web/src/modules/calls/presentation/components/GroupCallModal.tsx
diff --git a/apps/web/src/modules/chats/application/chatStore.ts b/client-web/src/modules/chats/application/chatStore.ts
similarity index 100%
rename from apps/web/src/modules/chats/application/chatStore.ts
rename to client-web/src/modules/chats/application/chatStore.ts
diff --git a/apps/web/src/modules/chats/infrastructure/chatApi.ts b/client-web/src/modules/chats/infrastructure/chatApi.ts
similarity index 100%
rename from apps/web/src/modules/chats/infrastructure/chatApi.ts
rename to client-web/src/modules/chats/infrastructure/chatApi.ts
diff --git a/apps/web/src/modules/chats/presentation/ChatPage.tsx b/client-web/src/modules/chats/presentation/ChatPage.tsx
similarity index 100%
rename from apps/web/src/modules/chats/presentation/ChatPage.tsx
rename to client-web/src/modules/chats/presentation/ChatPage.tsx
diff --git a/apps/web/src/modules/chats/presentation/components/ChatListItem.tsx b/client-web/src/modules/chats/presentation/components/ChatListItem.tsx
similarity index 100%
rename from apps/web/src/modules/chats/presentation/components/ChatListItem.tsx
rename to client-web/src/modules/chats/presentation/components/ChatListItem.tsx
diff --git a/apps/web/src/modules/chats/presentation/components/ChatView.tsx b/client-web/src/modules/chats/presentation/components/ChatView.tsx
similarity index 100%
rename from apps/web/src/modules/chats/presentation/components/ChatView.tsx
rename to client-web/src/modules/chats/presentation/components/ChatView.tsx
diff --git a/apps/web/src/modules/chats/presentation/components/EmojiPicker.tsx b/client-web/src/modules/chats/presentation/components/EmojiPicker.tsx
similarity index 100%
rename from apps/web/src/modules/chats/presentation/components/EmojiPicker.tsx
rename to client-web/src/modules/chats/presentation/components/EmojiPicker.tsx
diff --git a/apps/web/src/modules/chats/presentation/components/ForwardModal.tsx b/client-web/src/modules/chats/presentation/components/ForwardModal.tsx
similarity index 100%
rename from apps/web/src/modules/chats/presentation/components/ForwardModal.tsx
rename to client-web/src/modules/chats/presentation/components/ForwardModal.tsx
diff --git a/apps/web/src/modules/chats/presentation/components/GroupSettings.tsx b/client-web/src/modules/chats/presentation/components/GroupSettings.tsx
similarity index 100%
rename from apps/web/src/modules/chats/presentation/components/GroupSettings.tsx
rename to client-web/src/modules/chats/presentation/components/GroupSettings.tsx
diff --git a/apps/web/src/modules/chats/presentation/components/LinkPreview.tsx b/client-web/src/modules/chats/presentation/components/LinkPreview.tsx
similarity index 100%
rename from apps/web/src/modules/chats/presentation/components/LinkPreview.tsx
rename to client-web/src/modules/chats/presentation/components/LinkPreview.tsx
diff --git a/apps/web/src/modules/chats/presentation/components/MessageBubble.tsx b/client-web/src/modules/chats/presentation/components/MessageBubble.tsx
similarity index 100%
rename from apps/web/src/modules/chats/presentation/components/MessageBubble.tsx
rename to client-web/src/modules/chats/presentation/components/MessageBubble.tsx
diff --git a/apps/web/src/modules/chats/presentation/components/MessageInput.tsx b/client-web/src/modules/chats/presentation/components/MessageInput.tsx
similarity index 100%
rename from apps/web/src/modules/chats/presentation/components/MessageInput.tsx
rename to client-web/src/modules/chats/presentation/components/MessageInput.tsx
diff --git a/apps/web/src/modules/chats/presentation/components/NewChatModal.tsx b/client-web/src/modules/chats/presentation/components/NewChatModal.tsx
similarity index 100%
rename from apps/web/src/modules/chats/presentation/components/NewChatModal.tsx
rename to client-web/src/modules/chats/presentation/components/NewChatModal.tsx
diff --git a/apps/web/src/modules/chats/presentation/components/TypingIndicator.tsx b/client-web/src/modules/chats/presentation/components/TypingIndicator.tsx
similarity index 100%
rename from apps/web/src/modules/chats/presentation/components/TypingIndicator.tsx
rename to client-web/src/modules/chats/presentation/components/TypingIndicator.tsx
diff --git a/apps/web/src/modules/friends/application/friendStore.ts b/client-web/src/modules/friends/application/friendStore.ts
similarity index 100%
rename from apps/web/src/modules/friends/application/friendStore.ts
rename to client-web/src/modules/friends/application/friendStore.ts
diff --git a/apps/web/src/modules/friends/infrastructure/friendApi.ts b/client-web/src/modules/friends/infrastructure/friendApi.ts
similarity index 100%
rename from apps/web/src/modules/friends/infrastructure/friendApi.ts
rename to client-web/src/modules/friends/infrastructure/friendApi.ts
diff --git a/apps/web/src/modules/stories/application/storyStore.ts b/client-web/src/modules/stories/application/storyStore.ts
similarity index 100%
rename from apps/web/src/modules/stories/application/storyStore.ts
rename to client-web/src/modules/stories/application/storyStore.ts
diff --git a/apps/web/src/modules/stories/infrastructure/storyApi.ts b/client-web/src/modules/stories/infrastructure/storyApi.ts
similarity index 100%
rename from apps/web/src/modules/stories/infrastructure/storyApi.ts
rename to client-web/src/modules/stories/infrastructure/storyApi.ts
diff --git a/apps/web/src/modules/stories/presentation/components/StoryViewer.tsx b/client-web/src/modules/stories/presentation/components/StoryViewer.tsx
similarity index 100%
rename from apps/web/src/modules/stories/presentation/components/StoryViewer.tsx
rename to client-web/src/modules/stories/presentation/components/StoryViewer.tsx
diff --git a/apps/web/src/modules/users/infrastructure/userApi.ts b/client-web/src/modules/users/infrastructure/userApi.ts
similarity index 100%
rename from apps/web/src/modules/users/infrastructure/userApi.ts
rename to client-web/src/modules/users/infrastructure/userApi.ts
diff --git a/apps/web/src/modules/users/presentation/components/TelegramImportModal.tsx b/client-web/src/modules/users/presentation/components/TelegramImportModal.tsx
similarity index 100%
rename from apps/web/src/modules/users/presentation/components/TelegramImportModal.tsx
rename to client-web/src/modules/users/presentation/components/TelegramImportModal.tsx
diff --git a/apps/web/src/modules/users/presentation/components/UserProfile.tsx b/client-web/src/modules/users/presentation/components/UserProfile.tsx
similarity index 100%
rename from apps/web/src/modules/users/presentation/components/UserProfile.tsx
rename to client-web/src/modules/users/presentation/components/UserProfile.tsx
diff --git a/apps/web/src/vite-env.d.ts b/client-web/src/vite-env.d.ts
similarity index 100%
rename from apps/web/src/vite-env.d.ts
rename to client-web/src/vite-env.d.ts
diff --git a/apps/web/tsconfig.json b/client-web/tsconfig.json
similarity index 100%
rename from apps/web/tsconfig.json
rename to client-web/tsconfig.json
diff --git a/apps/web/vite.config.ts b/client-web/vite.config.ts
similarity index 100%
rename from apps/web/vite.config.ts
rename to client-web/vite.config.ts