diff --git a/src/EchoHub.Client/hue_icon.ico b/src/EchoHub.Client/Assets/hue_icon.ico
similarity index 100%
rename from src/EchoHub.Client/hue_icon.ico
rename to src/EchoHub.Client/Assets/hue_icon.ico
diff --git a/src/EchoHub.Client/UI/AudioPlayerDialog.cs b/src/EchoHub.Client/UI/Dialogs/AudioPlayerDialog.cs
similarity index 100%
rename from src/EchoHub.Client/UI/AudioPlayerDialog.cs
rename to src/EchoHub.Client/UI/Dialogs/AudioPlayerDialog.cs
diff --git a/src/EchoHub.Client/UI/ConnectDialog.cs b/src/EchoHub.Client/UI/Dialogs/ConnectDialog.cs
similarity index 100%
rename from src/EchoHub.Client/UI/ConnectDialog.cs
rename to src/EchoHub.Client/UI/Dialogs/ConnectDialog.cs
diff --git a/src/EchoHub.Client/UI/CreateChannelDialog.cs b/src/EchoHub.Client/UI/Dialogs/CreateChannelDialog.cs
similarity index 100%
rename from src/EchoHub.Client/UI/CreateChannelDialog.cs
rename to src/EchoHub.Client/UI/Dialogs/CreateChannelDialog.cs
diff --git a/src/EchoHub.Client/UI/ProfileEditDialog.cs b/src/EchoHub.Client/UI/Dialogs/ProfileEditDialog.cs
similarity index 100%
rename from src/EchoHub.Client/UI/ProfileEditDialog.cs
rename to src/EchoHub.Client/UI/Dialogs/ProfileEditDialog.cs
diff --git a/src/EchoHub.Client/UI/ProfileViewDialog.cs b/src/EchoHub.Client/UI/Dialogs/ProfileViewDialog.cs
similarity index 100%
rename from src/EchoHub.Client/UI/ProfileViewDialog.cs
rename to src/EchoHub.Client/UI/Dialogs/ProfileViewDialog.cs
diff --git a/src/EchoHub.Client/UI/StatusDialog.cs b/src/EchoHub.Client/UI/Dialogs/StatusDialog.cs
similarity index 100%
rename from src/EchoHub.Client/UI/StatusDialog.cs
rename to src/EchoHub.Client/UI/Dialogs/StatusDialog.cs
diff --git a/src/EchoHub.Client/UI/UpdateConfirmDialog.cs b/src/EchoHub.Client/UI/Dialogs/UpdateConfirmDialog.cs
similarity index 100%
rename from src/EchoHub.Client/UI/UpdateConfirmDialog.cs
rename to src/EchoHub.Client/UI/Dialogs/UpdateConfirmDialog.cs
diff --git a/src/EchoHub.Client/UI/UpdateProgressDialog.cs b/src/EchoHub.Client/UI/Dialogs/UpdateProgressDialog.cs
similarity index 100%
rename from src/EchoHub.Client/UI/UpdateProgressDialog.cs
rename to src/EchoHub.Client/UI/Dialogs/UpdateProgressDialog.cs
diff --git a/src/EchoHub.Server/hue_icon.ico b/src/EchoHub.Server/hue_icon.ico
deleted file mode 100644
index dd2668c..0000000
Binary files a/src/EchoHub.Server/hue_icon.ico and /dev/null differ