diff --git a/DisCatSharp/Clients/BaseDiscordClient.cs b/DisCatSharp/Clients/Base/BaseDiscordClient.cs
similarity index 100%
rename from DisCatSharp/Clients/BaseDiscordClient.cs
rename to DisCatSharp/Clients/Base/BaseDiscordClient.cs
diff --git a/DisCatSharp/Net/Rest/DiscordApiClient.cs b/DisCatSharp/Clients/Rest/DiscordApiClient.cs
similarity index 100%
rename from DisCatSharp/Net/Rest/DiscordApiClient.cs
rename to DisCatSharp/Clients/Rest/DiscordApiClient.cs
diff --git a/DisCatSharp/Clients/DiscordShardedClient.cs b/DisCatSharp/Clients/Sharding/DiscordShardedClient.cs
similarity index 100%
rename from DisCatSharp/Clients/DiscordShardedClient.cs
rename to DisCatSharp/Clients/Sharding/DiscordShardedClient.cs
diff --git a/DisCatSharp/Clients/DiscordShardedClient.Events.cs b/DisCatSharp/Clients/Sharding/Events/DiscordShardedClient.Events.cs
similarity index 100%
rename from DisCatSharp/Clients/DiscordShardedClient.Events.cs
rename to DisCatSharp/Clients/Sharding/Events/DiscordShardedClient.Events.cs
diff --git a/DisCatSharp/Clients/DiscordClient.cs b/DisCatSharp/Clients/Single/DiscordClient.cs
similarity index 100%
rename from DisCatSharp/Clients/DiscordClient.cs
rename to DisCatSharp/Clients/Single/DiscordClient.cs
diff --git a/DisCatSharp/Clients/DiscordClient.Dispatch.cs b/DisCatSharp/Clients/Single/Dispatch/DiscordClient.Dispatch.cs
similarity index 100%
rename from DisCatSharp/Clients/DiscordClient.Dispatch.cs
rename to DisCatSharp/Clients/Single/Dispatch/DiscordClient.Dispatch.cs
diff --git a/DisCatSharp/Clients/DiscordClient.EventHandlers.cs b/DisCatSharp/Clients/Single/Events/DiscordClient.EventHandlers.cs
similarity index 100%
rename from DisCatSharp/Clients/DiscordClient.EventHandlers.cs
rename to DisCatSharp/Clients/Single/Events/DiscordClient.EventHandlers.cs
diff --git a/DisCatSharp/Clients/DiscordClient.Events.cs b/DisCatSharp/Clients/Single/Events/DiscordClient.Events.cs
similarity index 100%
rename from DisCatSharp/Clients/DiscordClient.Events.cs
rename to DisCatSharp/Clients/Single/Events/DiscordClient.Events.cs
diff --git a/DisCatSharp/Clients/DiscordClient.WebSocket.cs b/DisCatSharp/Clients/Single/Websocket/DiscordClient.WebSocket.cs
similarity index 100%
rename from DisCatSharp/Clients/DiscordClient.WebSocket.cs
rename to DisCatSharp/Clients/Single/Websocket/DiscordClient.WebSocket.cs
diff --git a/DisCatSharp/Clients/DiscordWebhookClient.cs b/DisCatSharp/Clients/Webhooks/DiscordWebhookClient.cs
similarity index 100%
rename from DisCatSharp/Clients/DiscordWebhookClient.cs
rename to DisCatSharp/Clients/Webhooks/DiscordWebhookClient.cs