diff --git a/clients/chrome/background.js b/senders/chrome/background.js
similarity index 100%
rename from clients/chrome/background.js
rename to senders/chrome/background.js
diff --git a/clients/chrome/icons/icon128.png b/senders/chrome/icons/icon128.png
similarity index 100%
rename from clients/chrome/icons/icon128.png
rename to senders/chrome/icons/icon128.png
diff --git a/clients/chrome/icons/icon16.png b/senders/chrome/icons/icon16.png
similarity index 100%
rename from clients/chrome/icons/icon16.png
rename to senders/chrome/icons/icon16.png
diff --git a/clients/chrome/icons/icon48.png b/senders/chrome/icons/icon48.png
similarity index 100%
rename from clients/chrome/icons/icon48.png
rename to senders/chrome/icons/icon48.png
diff --git a/clients/chrome/manifest.json b/senders/chrome/manifest.json
similarity index 100%
rename from clients/chrome/manifest.json
rename to senders/chrome/manifest.json
diff --git a/clients/chrome/popup.html b/senders/chrome/popup.html
similarity index 100%
rename from clients/chrome/popup.html
rename to senders/chrome/popup.html
diff --git a/clients/chrome/popup.js b/senders/chrome/popup.js
similarity index 100%
rename from clients/chrome/popup.js
rename to senders/chrome/popup.js
diff --git a/clients/nautilus/README.md b/senders/nautilus/README.md
similarity index 100%
rename from clients/nautilus/README.md
rename to senders/nautilus/README.md
diff --git a/clients/nautilus/fcast_nautilus.py b/senders/nautilus/fcast_nautilus.py
similarity index 100%
rename from clients/nautilus/fcast_nautilus.py
rename to senders/nautilus/fcast_nautilus.py
diff --git a/clients/nautilus/install.sh b/senders/nautilus/install.sh
similarity index 100%
rename from clients/nautilus/install.sh
rename to senders/nautilus/install.sh
diff --git a/clients/nautilus/reinstall.sh b/senders/nautilus/reinstall.sh
similarity index 100%
rename from clients/nautilus/reinstall.sh
rename to senders/nautilus/reinstall.sh
diff --git a/clients/nautilus/screenshot.png b/senders/nautilus/screenshot.png
similarity index 100%
rename from clients/nautilus/screenshot.png
rename to senders/nautilus/screenshot.png
diff --git a/clients/nautilus/uninstall.sh b/senders/nautilus/uninstall.sh
similarity index 100%
rename from clients/nautilus/uninstall.sh
rename to senders/nautilus/uninstall.sh
diff --git a/clients/terminal-dotnet/.gitignore b/senders/terminal-dotnet/.gitignore
similarity index 100%
rename from clients/terminal-dotnet/.gitignore
rename to senders/terminal-dotnet/.gitignore
diff --git a/clients/terminal-dotnet/FCastClient.Cli/FCastClient.Cli.csproj b/senders/terminal-dotnet/FCastClient.Cli/FCastClient.Cli.csproj
similarity index 100%
rename from clients/terminal-dotnet/FCastClient.Cli/FCastClient.Cli.csproj
rename to senders/terminal-dotnet/FCastClient.Cli/FCastClient.Cli.csproj
diff --git a/clients/terminal-dotnet/FCastClient.Cli/Program.cs b/senders/terminal-dotnet/FCastClient.Cli/Program.cs
similarity index 100%
rename from clients/terminal-dotnet/FCastClient.Cli/Program.cs
rename to senders/terminal-dotnet/FCastClient.Cli/Program.cs
diff --git a/clients/terminal-dotnet/FCastClient.Cli/README.md b/senders/terminal-dotnet/FCastClient.Cli/README.md
similarity index 100%
rename from clients/terminal-dotnet/FCastClient.Cli/README.md
rename to senders/terminal-dotnet/FCastClient.Cli/README.md
diff --git a/clients/terminal-dotnet/FCastClient.Cli/WebSocketStream.cs b/senders/terminal-dotnet/FCastClient.Cli/WebSocketStream.cs
similarity index 100%
rename from clients/terminal-dotnet/FCastClient.Cli/WebSocketStream.cs
rename to senders/terminal-dotnet/FCastClient.Cli/WebSocketStream.cs
diff --git a/clients/terminal-dotnet/FCastClient/FCastClient.csproj b/senders/terminal-dotnet/FCastClient/FCastClient.csproj
similarity index 100%
rename from clients/terminal-dotnet/FCastClient/FCastClient.csproj
rename to senders/terminal-dotnet/FCastClient/FCastClient.csproj
diff --git a/clients/terminal-dotnet/FCastClient/FCastSession.cs b/senders/terminal-dotnet/FCastClient/FCastSession.cs
similarity index 100%
rename from clients/terminal-dotnet/FCastClient/FCastSession.cs
rename to senders/terminal-dotnet/FCastClient/FCastSession.cs
diff --git a/clients/terminal-dotnet/FCastClient/Models.cs b/senders/terminal-dotnet/FCastClient/Models.cs
similarity index 100%
rename from clients/terminal-dotnet/FCastClient/Models.cs
rename to senders/terminal-dotnet/FCastClient/Models.cs
diff --git a/clients/terminal/.gitignore b/senders/terminal/.gitignore
similarity index 100%
rename from clients/terminal/.gitignore
rename to senders/terminal/.gitignore
diff --git a/clients/terminal/Cargo.lock b/senders/terminal/Cargo.lock
similarity index 100%
rename from clients/terminal/Cargo.lock
rename to senders/terminal/Cargo.lock
diff --git a/clients/terminal/Cargo.toml b/senders/terminal/Cargo.toml
similarity index 100%
rename from clients/terminal/Cargo.toml
rename to senders/terminal/Cargo.toml
diff --git a/clients/terminal/README.md b/senders/terminal/README.md
similarity index 100%
rename from clients/terminal/README.md
rename to senders/terminal/README.md
diff --git a/clients/terminal/src/fcastsession.rs b/senders/terminal/src/fcastsession.rs
similarity index 100%
rename from clients/terminal/src/fcastsession.rs
rename to senders/terminal/src/fcastsession.rs
diff --git a/clients/terminal/src/file_server.rs b/senders/terminal/src/file_server.rs
similarity index 100%
rename from clients/terminal/src/file_server.rs
rename to senders/terminal/src/file_server.rs
diff --git a/clients/terminal/src/main.rs b/senders/terminal/src/main.rs
similarity index 100%
rename from clients/terminal/src/main.rs
rename to senders/terminal/src/main.rs
diff --git a/clients/terminal/src/models.rs b/senders/terminal/src/models.rs
similarity index 100%
rename from clients/terminal/src/models.rs
rename to senders/terminal/src/models.rs
diff --git a/clients/terminal/src/transport.rs b/senders/terminal/src/transport.rs
similarity index 100%
rename from clients/terminal/src/transport.rs
rename to senders/terminal/src/transport.rs