diff --git a/.github/workflows/gh-actions.yml b/.github/workflows/gh-actions.yml
index 9ad4f28..46526c7 100644
--- a/.github/workflows/gh-actions.yml
+++ b/.github/workflows/gh-actions.yml
@@ -47,4 +47,4 @@ jobs:
         run: dotnet build /p:Configuration=Release /v:quiet /p:WarningLevel=1 QuantConnect.BybitBrokerage.sln
 
       - name: Run Tests
-        run: dotnet test ./QuantConnect.BybitBrokerage.Tests/bin/Release/QuantConnect.BybitBrokerage.Tests.dll
+        run: dotnet test ./QuantConnect.BybitBrokerage.Tests/bin/Release/QuantConnect.Brokerages.Bybit.Tests.dll
diff --git a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageAdditionalTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageAdditionalTests.cs
index 1cdc160..a6f2e18 100644
--- a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageAdditionalTests.cs
+++ b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageAdditionalTests.cs
@@ -16,7 +16,6 @@
 using System;
 using Moq;
 using NUnit.Framework;
-using QuantConnect.Brokerages;
 using QuantConnect.Configuration;
 using QuantConnect.Util;
 using QuantConnect.Interfaces;
@@ -24,7 +23,7 @@
 using QuantConnect.Securities;
 using QuantConnect.Tests.Common.Securities;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture, Explicit("Requires valid credentials to be setup and run outside USA")]
     public class BybitBrokerageAdditionalTests
diff --git a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageFactoryTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageFactoryTests.cs
index a898aa5..3aec580 100644
--- a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageFactoryTests.cs
+++ b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageFactoryTests.cs
@@ -17,7 +17,7 @@
 using QuantConnect.Interfaces;
 using QuantConnect.Util;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture]
     public class BybitBrokerageFactoryTests
diff --git a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageHistoryProviderTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageHistoryProviderTests.cs
index 3725720..a20ba64 100644
--- a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageHistoryProviderTests.cs
+++ b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageHistoryProviderTests.cs
@@ -16,7 +16,6 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
-using QuantConnect.Brokerages;
 using QuantConnect.Configuration;
 using QuantConnect.Data;
 using QuantConnect.Tests;
@@ -25,7 +24,7 @@
 using QuantConnect.Data.Market;
 using QuantConnect.Lean.Engine.DataFeeds;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture, Explicit("Requires valid credentials to be setup and run outside USA")]
     public class BybitBrokerageHistoryProviderTests
diff --git a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageTests.Stream.cs b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageTests.Stream.cs
index 79a2d63..7144c51 100644
--- a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageTests.Stream.cs
+++ b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageTests.Stream.cs
@@ -21,7 +21,7 @@
 using QuantConnect.Data.Market;
 using QuantConnect.Interfaces;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture]
     public partial class BybitBrokerageTests
diff --git a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageTests.cs
index 6bf5e59..e6179a9 100644
--- a/QuantConnect.BybitBrokerage.Tests/BybitBrokerageTests.cs
+++ b/QuantConnect.BybitBrokerage.Tests/BybitBrokerageTests.cs
@@ -18,9 +18,8 @@
 using System.Threading;
 using Moq;
 using NUnit.Framework;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Api;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Api;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Configuration;
 using QuantConnect.Interfaces;
 using QuantConnect.Lean.Engine.DataFeeds;
@@ -31,7 +30,7 @@
 using QuantConnect.Tests.Brokerages;
 using QuantConnect.Util;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture, Explicit("Requires valid credentials to be setup and run outside USA")]
     public partial class BybitBrokerageTests : BrokerageTests
diff --git a/QuantConnect.BybitBrokerage.Tests/BybitExchangeInfoDownloaderTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitExchangeInfoDownloaderTests.cs
index 4c8f094..e89f0e5 100644
--- a/QuantConnect.BybitBrokerage.Tests/BybitExchangeInfoDownloaderTests.cs
+++ b/QuantConnect.BybitBrokerage.Tests/BybitExchangeInfoDownloaderTests.cs
@@ -19,7 +19,7 @@
 using System;
 using System.Linq;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture, Explicit("Requires valid credentials to be setup and run outside USA")]
     public class BybitExchangeInfoDownloaderTests
diff --git a/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageHistoryProviderTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageHistoryProviderTests.cs
index c4584ae..78244ee 100644
--- a/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageHistoryProviderTests.cs
+++ b/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageHistoryProviderTests.cs
@@ -16,7 +16,7 @@
 using System;
 using NUnit.Framework;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture, Explicit("Requires valid credentials to be setup and run outside USA")]
     public class BybitFuturesBrokerageHistoryProviderTests : BybitBrokerageHistoryProviderTests
diff --git a/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageTests.Stream.cs b/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageTests.Stream.cs
index d48c349..48800d5 100644
--- a/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageTests.Stream.cs
+++ b/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageTests.Stream.cs
@@ -15,7 +15,7 @@
 
 using NUnit.Framework;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture]
     public partial class BybitFuturesBrokerageTests
diff --git a/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageTests.cs b/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageTests.cs
index 160321d..1a80551 100644
--- a/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageTests.cs
+++ b/QuantConnect.BybitBrokerage.Tests/BybitFuturesBrokerageTests.cs
@@ -14,11 +14,10 @@
 */
 
 using NUnit.Framework;
-using QuantConnect.BybitBrokerage.Models.Enums;
-using QuantConnect.Orders.Fees;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Tests.Brokerages;
 
-namespace QuantConnect.BybitBrokerage.Tests;
+namespace QuantConnect.Brokerages.Bybit.Tests;
 
 [TestFixture, Explicit("Requires valid credentials to be setup and run outside USA")]
 public partial class BybitFuturesBrokerageTests : BybitBrokerageTests
diff --git a/QuantConnect.BybitBrokerage.Tests/JsonConverters/JsonConverterTests.cs b/QuantConnect.BybitBrokerage.Tests/JsonConverters/JsonConverterTests.cs
index c25bcac..9690eca 100644
--- a/QuantConnect.BybitBrokerage.Tests/JsonConverters/JsonConverterTests.cs
+++ b/QuantConnect.BybitBrokerage.Tests/JsonConverters/JsonConverterTests.cs
@@ -17,10 +17,10 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using NUnit.Framework;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models;
 
-namespace QuantConnect.BybitBrokerage.Tests.JsonConverters;
+namespace QuantConnect.Brokerages.Bybit.Tests.JsonConverters;
 
 public class JsonConverterTests
 {
diff --git a/QuantConnect.BybitBrokerage.Tests/QuantConnect.BybitBrokerage.Tests.csproj b/QuantConnect.BybitBrokerage.Tests/QuantConnect.BybitBrokerage.Tests.csproj
index abd8c8a..2d57f9b 100644
--- a/QuantConnect.BybitBrokerage.Tests/QuantConnect.BybitBrokerage.Tests.csproj
+++ b/QuantConnect.BybitBrokerage.Tests/QuantConnect.BybitBrokerage.Tests.csproj
@@ -9,11 +9,12 @@
         <Copyright>Copyright ©  2021</Copyright>
         <TestProjectType>UnitTest</TestProjectType>
         <OutputPath>bin\$(Configuration)\</OutputPath>
-        <Product>QuantConnect.BybitBrokerage.Tests</Product>
-        <RootNamespace>QuantConnect.BybitBrokerage.Tests</RootNamespace>
-        <AssemblyTitle>QuantConnect.BybitBrokerage.Tests</AssemblyTitle>
+        <Product>QuantConnect.Brokerages.Bybit.Tests</Product>
+        <RootNamespace>QuantConnect.Brokerages.Bybit.Tests</RootNamespace>
+        <AssemblyTitle>QuantConnect.Brokerages.Bybit.Tests</AssemblyTitle>
+		<AssemblyName>QuantConnect.Brokerages.Bybit.Tests</AssemblyName>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <PackageId>QuantConnect.BybitBrokerage.Tests</PackageId>
+        <PackageId>QuantConnect.Brokerages.Bybit.Tests</PackageId>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/QuantConnect.BybitBrokerage.Tests/TestSetup.cs b/QuantConnect.BybitBrokerage.Tests/TestSetup.cs
index 4f5e7be..89568b2 100644
--- a/QuantConnect.BybitBrokerage.Tests/TestSetup.cs
+++ b/QuantConnect.BybitBrokerage.Tests/TestSetup.cs
@@ -20,7 +20,7 @@
 using QuantConnect.Logging;
 using QuantConnect.Configuration;
 
-namespace QuantConnect.BybitBrokerage.Tests
+namespace QuantConnect.Brokerages.Bybit.Tests
 {
     [TestFixture]
     public class TestSetup
diff --git a/QuantConnect.BybitBrokerage.ToolBox/BybitBrokerageDownloader.cs b/QuantConnect.BybitBrokerage.ToolBox/BybitBrokerageDownloader.cs
index 648ed66..54c4c54 100644
--- a/QuantConnect.BybitBrokerage.ToolBox/BybitBrokerageDownloader.cs
+++ b/QuantConnect.BybitBrokerage.ToolBox/BybitBrokerageDownloader.cs
@@ -17,7 +17,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using NodaTime;
-using QuantConnect.Brokerages;
 using QuantConnect.Configuration;
 using QuantConnect.Data;
 using QuantConnect.Data.Market;
@@ -25,7 +24,7 @@
 using QuantConnect.Securities;
 using QuantConnect.Util;
 
-namespace QuantConnect.BybitBrokerage.ToolBox
+namespace QuantConnect.Brokerages.Bybit.ToolBox
 {
     /// <summary>
     /// Template Brokerage Data Downloader implementation
diff --git a/QuantConnect.BybitBrokerage.ToolBox/BybitExchangeInfoDownloader.cs b/QuantConnect.BybitBrokerage.ToolBox/BybitExchangeInfoDownloader.cs
index 5b72096..6a35199 100644
--- a/QuantConnect.BybitBrokerage.ToolBox/BybitExchangeInfoDownloader.cs
+++ b/QuantConnect.BybitBrokerage.ToolBox/BybitExchangeInfoDownloader.cs
@@ -16,13 +16,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using QuantConnect.BybitBrokerage.Api;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Api;
+using QuantConnect.Brokerages.Bybit.Models;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Configuration;
 using QuantConnect.ToolBox;
 
-namespace QuantConnect.BybitBrokerage.ToolBox
+namespace QuantConnect.Brokerages.Bybit.ToolBox
 {
     /// <summary>
     /// Template Brokerage implementation of <see cref="IExchangeInfoDownloader"/>
@@ -75,7 +75,7 @@ private string GetInstrumentInfoString(BybitInstrumentInfo info, SecurityType se
         {
             var securityTypeStr = securityType.ToStringInvariant().ToLowerInvariant();
 
-            // Remove multiplier prefix from symbols like 10000LADYSUSDT. Not 1 as there is also 1INCHUSDT 
+            // Remove multiplier prefix from symbols like 10000LADYSUSDT. Not 1 as there is also 1INCHUSDT
             var symbolName = info.Symbol.StartsWith("10") ? info.Symbol.TrimStart('0', '1') : info.Symbol;
 
             // market,symbol,type,description,quote_currency,contract_multiplier,minimum_price_variation,lot_size,market_ticker,minimum_order_size,price_magnifier
diff --git a/QuantConnect.BybitBrokerage.ToolBox/Program.cs b/QuantConnect.BybitBrokerage.ToolBox/Program.cs
index a88a4fe..296acf5 100644
--- a/QuantConnect.BybitBrokerage.ToolBox/Program.cs
+++ b/QuantConnect.BybitBrokerage.ToolBox/Program.cs
@@ -14,12 +14,11 @@
 */
 
 using System;
-using System.Collections.Generic;
 using QuantConnect.Configuration;
 using QuantConnect.ToolBox;
 using static QuantConnect.Configuration.ApplicationParser;
 
-namespace QuantConnect.BybitBrokerage.ToolBox
+namespace QuantConnect.Brokerages.Bybit.ToolBox
 {
     static class Program
     {
diff --git a/QuantConnect.BybitBrokerage.ToolBox/QuantConnect.BybitBrokerage.ToolBox.csproj b/QuantConnect.BybitBrokerage.ToolBox/QuantConnect.BybitBrokerage.ToolBox.csproj
index 18332fe..4fa1333 100644
--- a/QuantConnect.BybitBrokerage.ToolBox/QuantConnect.BybitBrokerage.ToolBox.csproj
+++ b/QuantConnect.BybitBrokerage.ToolBox/QuantConnect.BybitBrokerage.ToolBox.csproj
@@ -7,15 +7,15 @@
         <TargetFramework>net6.0</TargetFramework>
         <Copyright>Copyright ©  2021</Copyright>
         <OutputPath>bin\$(Configuration)\</OutputPath>
-        <Product>QuantConnect.BybitBrokerage.ToolBox</Product>
-        <RootNamespace>QuantConnect.BybitBrokerage.ToolBox</RootNamespace>
-        <AssemblyTitle>QuantConnect.BybitBrokerage.ToolBox</AssemblyTitle>
-        <AssemblyName>QuantConnect.BybitBrokerage.ToolBox</AssemblyName>
+        <Product>QuantConnect.Brokerages.Bybit.ToolBox</Product>
+        <RootNamespace>QuantConnect.Brokerages.Bybit.ToolBox</RootNamespace>
+        <AssemblyTitle>QuantConnect.Brokerages.Bybit.ToolBox</AssemblyTitle>
+        <AssemblyName>QuantConnect.Brokerages.Bybit.ToolBox</AssemblyName>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <Description>QuantConnect LEAN Bybit Brokerage: Bybit Brokerage toolbox plugin for Lean</Description>
-        <PackageId>QuantConnect.BybitBrokerage.ToolBox</PackageId>
+        <PackageId>QuantConnect.Brokerages.Bybit.ToolBox</PackageId>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <DebugType>full</DebugType>
diff --git a/QuantConnect.BybitBrokerage/Api/BybitAccountApiEndpoint.cs b/QuantConnect.BybitBrokerage/Api/BybitAccountApiEndpoint.cs
index f6f13aa..d486e98 100644
--- a/QuantConnect.BybitBrokerage/Api/BybitAccountApiEndpoint.cs
+++ b/QuantConnect.BybitBrokerage/Api/BybitAccountApiEndpoint.cs
@@ -14,12 +14,10 @@
 */
 
 using System.Collections.Generic;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models;
 using QuantConnect.Securities;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Bybit account api endpoint implementation
diff --git a/QuantConnect.BybitBrokerage/Api/BybitApi.cs b/QuantConnect.BybitBrokerage/Api/BybitApi.cs
index 09d4dac..83d4008 100644
--- a/QuantConnect.BybitBrokerage/Api/BybitApi.cs
+++ b/QuantConnect.BybitBrokerage/Api/BybitApi.cs
@@ -15,11 +15,10 @@
 
 using System;
 using System.Collections.Generic;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Securities;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Provides methods to work with the Bybit rest API
diff --git a/QuantConnect.BybitBrokerage/Api/BybitApiClient.cs b/QuantConnect.BybitBrokerage/Api/BybitApiClient.cs
index 7f932ff..ffb1a82 100644
--- a/QuantConnect.BybitBrokerage/Api/BybitApiClient.cs
+++ b/QuantConnect.BybitBrokerage/Api/BybitApiClient.cs
@@ -19,11 +19,10 @@
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Web;
 using QuantConnect.Util;
 using RestSharp;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Bybit api client implementation
diff --git a/QuantConnect.BybitBrokerage/Api/BybitApiEndpoint.cs b/QuantConnect.BybitBrokerage/Api/BybitApiEndpoint.cs
index c0ff8c7..dbc4c1d 100644
--- a/QuantConnect.BybitBrokerage/Api/BybitApiEndpoint.cs
+++ b/QuantConnect.BybitBrokerage/Api/BybitApiEndpoint.cs
@@ -21,15 +21,14 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Logging;
 using QuantConnect.Securities;
 using RestSharp;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Base Bybit api endpoint implementation
diff --git a/QuantConnect.BybitBrokerage/Api/BybitHistoryApi.cs b/QuantConnect.BybitBrokerage/Api/BybitHistoryApi.cs
index 3c1ee3f..f369178 100644
--- a/QuantConnect.BybitBrokerage/Api/BybitHistoryApi.cs
+++ b/QuantConnect.BybitBrokerage/Api/BybitHistoryApi.cs
@@ -18,13 +18,13 @@
 using System.Globalization;
 using System.IO;
 using System.IO.Compression;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models.Enums;
-using QuantConnect.BybitBrokerage.Models.Messages;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Messages;
 using QuantConnect.Logging;
 using RestSharp;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Implements functionality to download historical tick data from Bybit
diff --git a/QuantConnect.BybitBrokerage/Api/BybitMarketApiEndpoint.cs b/QuantConnect.BybitBrokerage/Api/BybitMarketApiEndpoint.cs
index b11ae8e..b27527b 100644
--- a/QuantConnect.BybitBrokerage/Api/BybitMarketApiEndpoint.cs
+++ b/QuantConnect.BybitBrokerage/Api/BybitMarketApiEndpoint.cs
@@ -16,12 +16,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Securities;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Bybit market api endpoint implementation
diff --git a/QuantConnect.BybitBrokerage/Api/BybitPositionApiEndpoint.cs b/QuantConnect.BybitBrokerage/Api/BybitPositionApiEndpoint.cs
index 363d3f6..c3e01ce 100644
--- a/QuantConnect.BybitBrokerage/Api/BybitPositionApiEndpoint.cs
+++ b/QuantConnect.BybitBrokerage/Api/BybitPositionApiEndpoint.cs
@@ -15,12 +15,11 @@
 
 using System;
 using System.Collections.Generic;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Securities;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Bybit position api endpoint implementation
diff --git a/QuantConnect.BybitBrokerage/Api/BybitTradeApiEndpoint.cs b/QuantConnect.BybitBrokerage/Api/BybitTradeApiEndpoint.cs
index 6a6cd1a..1653d2c 100644
--- a/QuantConnect.BybitBrokerage/Api/BybitTradeApiEndpoint.cs
+++ b/QuantConnect.BybitBrokerage/Api/BybitTradeApiEndpoint.cs
@@ -16,16 +16,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
-using QuantConnect.BybitBrokerage.Models.Requests;
+using QuantConnect.Brokerages.Bybit.Models;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Requests;
 using QuantConnect.Orders;
 using QuantConnect.Securities;
-using OrderType = QuantConnect.BybitBrokerage.Models.Enums.OrderType;
-using TimeInForce = QuantConnect.BybitBrokerage.Models.Enums.TimeInForce;
+using OrderType = QuantConnect.Brokerages.Bybit.Models.Enums.OrderType;
+using TimeInForce = QuantConnect.Brokerages.Bybit.Models.Enums.TimeInForce;
 
-namespace QuantConnect.BybitBrokerage.Api;
+namespace QuantConnect.Brokerages.Bybit.Api;
 
 /// <summary>
 /// Bybit trade api endpoint implementation
diff --git a/QuantConnect.BybitBrokerage/BybitBrokerage.Brokerage.cs b/QuantConnect.BybitBrokerage/BybitBrokerage.Brokerage.cs
index adb04b0..ba5f170 100644
--- a/QuantConnect.BybitBrokerage/BybitBrokerage.Brokerage.cs
+++ b/QuantConnect.BybitBrokerage/BybitBrokerage.Brokerage.cs
@@ -16,15 +16,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Orders;
 using QuantConnect.Orders.Fees;
 using QuantConnect.Securities;
 using OrderStatus = QuantConnect.Orders.OrderStatus;
-using OrderType = QuantConnect.BybitBrokerage.Models.Enums.OrderType;
+using OrderType = QuantConnect.Brokerages.Bybit.Models.Enums.OrderType;
 
-namespace QuantConnect.BybitBrokerage;
+namespace QuantConnect.Brokerages.Bybit;
 
 public partial class BybitBrokerage
 {
diff --git a/QuantConnect.BybitBrokerage/BybitBrokerage.DataQueueHandler.cs b/QuantConnect.BybitBrokerage/BybitBrokerage.DataQueueHandler.cs
index 9c963df..e05b5b3 100644
--- a/QuantConnect.BybitBrokerage/BybitBrokerage.DataQueueHandler.cs
+++ b/QuantConnect.BybitBrokerage/BybitBrokerage.DataQueueHandler.cs
@@ -16,13 +16,13 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Configuration;
 using QuantConnect.Data;
 using QuantConnect.Packets;
 using QuantConnect.Util;
 
-namespace QuantConnect.BybitBrokerage;
+namespace QuantConnect.Brokerages.Bybit;
 
 public partial class BybitBrokerage
 {
diff --git a/QuantConnect.BybitBrokerage/BybitBrokerage.Messaging.cs b/QuantConnect.BybitBrokerage/BybitBrokerage.Messaging.cs
index c690af7..1267001 100644
--- a/QuantConnect.BybitBrokerage/BybitBrokerage.Messaging.cs
+++ b/QuantConnect.BybitBrokerage/BybitBrokerage.Messaging.cs
@@ -21,21 +21,20 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Api;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models;
-using QuantConnect.BybitBrokerage.Models.Enums;
-using QuantConnect.BybitBrokerage.Models.Messages;
+using QuantConnect.Brokerages.Bybit.Api;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Messages;
 using QuantConnect.Data.Market;
 using QuantConnect.Logging;
 using QuantConnect.Orders;
 using QuantConnect.Orders.Fees;
 using QuantConnect.Securities;
 using QuantConnect.Util;
-using OrderStatus = QuantConnect.BybitBrokerage.Models.Enums.OrderStatus;
+using OrderStatus = QuantConnect.Brokerages.Bybit.Models.Enums.OrderStatus;
 
-namespace QuantConnect.BybitBrokerage;
+namespace QuantConnect.Brokerages.Bybit;
 
 public partial class BybitBrokerage
 {
diff --git a/QuantConnect.BybitBrokerage/BybitBrokerage.cs b/QuantConnect.BybitBrokerage/BybitBrokerage.cs
index 9f6eaa6..daaed6b 100644
--- a/QuantConnect.BybitBrokerage/BybitBrokerage.cs
+++ b/QuantConnect.BybitBrokerage/BybitBrokerage.cs
@@ -25,9 +25,8 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Runtime.CompilerServices;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Api;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Api;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Configuration;
 using QuantConnect.Data;
 using QuantConnect.Data.Market;
@@ -40,7 +39,7 @@
 using HistoryRequest = QuantConnect.Data.HistoryRequest;
 using OrderStatus = QuantConnect.Orders.OrderStatus;
 
-namespace QuantConnect.BybitBrokerage;
+namespace QuantConnect.Brokerages.Bybit;
 
 /// <summary>
 /// Bybit brokerage implementation
diff --git a/QuantConnect.BybitBrokerage/BybitBrokerageFactory.cs b/QuantConnect.BybitBrokerage/BybitBrokerageFactory.cs
index 702a1aa..ea6529e 100644
--- a/QuantConnect.BybitBrokerage/BybitBrokerageFactory.cs
+++ b/QuantConnect.BybitBrokerage/BybitBrokerageFactory.cs
@@ -15,8 +15,7 @@
 
 using System;
 using System.Collections.Generic;
-using QuantConnect.Brokerages;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 using QuantConnect.Configuration;
 using QuantConnect.Data;
 using QuantConnect.Interfaces;
@@ -24,7 +23,7 @@
 using QuantConnect.Securities;
 using QuantConnect.Util;
 
-namespace QuantConnect.BybitBrokerage
+namespace QuantConnect.Brokerages.Bybit
 {
     /// <summary>
     /// Factory method to create Bybit brokerage
diff --git a/QuantConnect.BybitBrokerage/BybitWebSocketWrapper.cs b/QuantConnect.BybitBrokerage/BybitWebSocketWrapper.cs
index dcbef76..36d0915 100644
--- a/QuantConnect.BybitBrokerage/BybitWebSocketWrapper.cs
+++ b/QuantConnect.BybitBrokerage/BybitWebSocketWrapper.cs
@@ -15,9 +15,8 @@
 
 using System;
 using System.Timers;
-using QuantConnect.Brokerages;
 
-namespace QuantConnect.BybitBrokerage;
+namespace QuantConnect.Brokerages.Bybit;
 
 /// <summary>
 /// Wrapper class for a Bybit websocket connection
diff --git a/QuantConnect.BybitBrokerage/Converters/ByBitBoolConverter.cs b/QuantConnect.BybitBrokerage/Converters/ByBitBoolConverter.cs
index 75c0306..6995f02 100644
--- a/QuantConnect.BybitBrokerage/Converters/ByBitBoolConverter.cs
+++ b/QuantConnect.BybitBrokerage/Converters/ByBitBoolConverter.cs
@@ -16,7 +16,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace QuantConnect.BybitBrokerage.Converters;
+namespace QuantConnect.Brokerages.Bybit.Converters;
 
 /// <summary>
 /// Json converter to support Bybits various bool return types
diff --git a/QuantConnect.BybitBrokerage/Converters/ByBitKlineJsonConverter.cs b/QuantConnect.BybitBrokerage/Converters/ByBitKlineJsonConverter.cs
index 6da6d8d..dde0d5e 100644
--- a/QuantConnect.BybitBrokerage/Converters/ByBitKlineJsonConverter.cs
+++ b/QuantConnect.BybitBrokerage/Converters/ByBitKlineJsonConverter.cs
@@ -17,9 +17,9 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using QuantConnect.BybitBrokerage.Models;
+using QuantConnect.Brokerages.Bybit.Models;
 
-namespace QuantConnect.BybitBrokerage.Converters;
+namespace QuantConnect.Brokerages.Bybit.Converters;
 
 /// <summary>
 /// JSON converter to convert Bybit KLines
diff --git a/QuantConnect.BybitBrokerage/Converters/BybitCandleTimeConverter.cs b/QuantConnect.BybitBrokerage/Converters/BybitCandleTimeConverter.cs
index e1f217d..61e05b4 100644
--- a/QuantConnect.BybitBrokerage/Converters/BybitCandleTimeConverter.cs
+++ b/QuantConnect.BybitBrokerage/Converters/BybitCandleTimeConverter.cs
@@ -16,7 +16,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace QuantConnect.BybitBrokerage.Converters;
+namespace QuantConnect.Brokerages.Bybit.Converters;
 
 /// <summary>
 /// JSON converter to convert Bybits candle time representation
diff --git a/QuantConnect.BybitBrokerage/Converters/BybitDecimalStringConverter.cs b/QuantConnect.BybitBrokerage/Converters/BybitDecimalStringConverter.cs
index abbc005..08bc19b 100644
--- a/QuantConnect.BybitBrokerage/Converters/BybitDecimalStringConverter.cs
+++ b/QuantConnect.BybitBrokerage/Converters/BybitDecimalStringConverter.cs
@@ -17,7 +17,7 @@
 using System.Globalization;
 using Newtonsoft.Json;
 
-namespace QuantConnect.BybitBrokerage.Converters;
+namespace QuantConnect.Brokerages.Bybit.Converters;
 
 /// <summary>
 /// Json converter to represent decimals as strings
diff --git a/QuantConnect.BybitBrokerage/Converters/BybitOrderBookEntryJsonConverter.cs b/QuantConnect.BybitBrokerage/Converters/BybitOrderBookEntryJsonConverter.cs
index ec50bf0..bbe1e7b 100644
--- a/QuantConnect.BybitBrokerage/Converters/BybitOrderBookEntryJsonConverter.cs
+++ b/QuantConnect.BybitBrokerage/Converters/BybitOrderBookEntryJsonConverter.cs
@@ -17,9 +17,9 @@
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using QuantConnect.BybitBrokerage.Models;
+using QuantConnect.Brokerages.Bybit.Models;
 
-namespace QuantConnect.BybitBrokerage.Converters;
+namespace QuantConnect.Brokerages.Bybit.Converters;
 
 /// <summary>
 /// JSON converter to convert Bybit order book rows
diff --git a/QuantConnect.BybitBrokerage/Converters/BybitTimeConverter.cs b/QuantConnect.BybitBrokerage/Converters/BybitTimeConverter.cs
index efe2d54..d4ded54 100644
--- a/QuantConnect.BybitBrokerage/Converters/BybitTimeConverter.cs
+++ b/QuantConnect.BybitBrokerage/Converters/BybitTimeConverter.cs
@@ -16,7 +16,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace QuantConnect.BybitBrokerage.Converters;
+namespace QuantConnect.Brokerages.Bybit.Converters;
 
 /// <summary>
 /// Json converter to read Bybits time representation
diff --git a/QuantConnect.BybitBrokerage/Models/ByBitBalance.cs b/QuantConnect.BybitBrokerage/Models/ByBitBalance.cs
index 636a578..de799e4 100644
--- a/QuantConnect.BybitBrokerage/Models/ByBitBalance.cs
+++ b/QuantConnect.BybitBrokerage/Models/ByBitBalance.cs
@@ -16,9 +16,9 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Balance info
diff --git a/QuantConnect.BybitBrokerage/Models/ByBitKLine.cs b/QuantConnect.BybitBrokerage/Models/ByBitKLine.cs
index 7e21f8b..b20748b 100644
--- a/QuantConnect.BybitBrokerage/Models/ByBitKLine.cs
+++ b/QuantConnect.BybitBrokerage/Models/ByBitKLine.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// KLine info
diff --git a/QuantConnect.BybitBrokerage/Models/ByBitLeverageFilter.cs b/QuantConnect.BybitBrokerage/Models/ByBitLeverageFilter.cs
index 629dae8..8ae57ba 100644
--- a/QuantConnect.BybitBrokerage/Models/ByBitLeverageFilter.cs
+++ b/QuantConnect.BybitBrokerage/Models/ByBitLeverageFilter.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Leverage attributes
diff --git a/QuantConnect.BybitBrokerage/Models/ByBitLotSizeFilter.cs b/QuantConnect.BybitBrokerage/Models/ByBitLotSizeFilter.cs
index 5c0fbc7..a42c54f 100644
--- a/QuantConnect.BybitBrokerage/Models/ByBitLotSizeFilter.cs
+++ b/QuantConnect.BybitBrokerage/Models/ByBitLotSizeFilter.cs
@@ -15,7 +15,7 @@
 
 using Newtonsoft.Json;
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Size attributes
diff --git a/QuantConnect.BybitBrokerage/Models/ByBitPriceFilter.cs b/QuantConnect.BybitBrokerage/Models/ByBitPriceFilter.cs
index 8759b4f..0268fce 100644
--- a/QuantConnect.BybitBrokerage/Models/ByBitPriceFilter.cs
+++ b/QuantConnect.BybitBrokerage/Models/ByBitPriceFilter.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Bybit instrument price attributes
diff --git a/QuantConnect.BybitBrokerage/Models/ByBitResponse.cs b/QuantConnect.BybitBrokerage/Models/ByBitResponse.cs
index c8d0584..fa2f32e 100644
--- a/QuantConnect.BybitBrokerage/Models/ByBitResponse.cs
+++ b/QuantConnect.BybitBrokerage/Models/ByBitResponse.cs
@@ -15,9 +15,9 @@
 
 using System;
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Converters;
+using QuantConnect.Brokerages.Bybit.Converters;
 
-namespace QuantConnect.BybitBrokerage.Models
+namespace QuantConnect.Brokerages.Bybit.Models
 {
     /// <summary>
     /// Bybits default http response message
diff --git a/QuantConnect.BybitBrokerage/Models/BybitAccountInfo.cs b/QuantConnect.BybitBrokerage/Models/BybitAccountInfo.cs
index bf5b540..649173e 100644
--- a/QuantConnect.BybitBrokerage/Models/BybitAccountInfo.cs
+++ b/QuantConnect.BybitBrokerage/Models/BybitAccountInfo.cs
@@ -15,10 +15,10 @@
 
 using System;
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Account info
diff --git a/QuantConnect.BybitBrokerage/Models/BybitAssetBalance.cs b/QuantConnect.BybitBrokerage/Models/BybitAssetBalance.cs
index c27ca5f..f3524bb 100644
--- a/QuantConnect.BybitBrokerage/Models/BybitAssetBalance.cs
+++ b/QuantConnect.BybitBrokerage/Models/BybitAssetBalance.cs
@@ -15,7 +15,7 @@
 
 using Newtonsoft.Json;
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Asset balance info
diff --git a/QuantConnect.BybitBrokerage/Models/BybitInstrumentInfo.cs b/QuantConnect.BybitBrokerage/Models/BybitInstrumentInfo.cs
index a174af0..11801d4 100644
--- a/QuantConnect.BybitBrokerage/Models/BybitInstrumentInfo.cs
+++ b/QuantConnect.BybitBrokerage/Models/BybitInstrumentInfo.cs
@@ -15,10 +15,10 @@
 
 using System;
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Instrument info
diff --git a/QuantConnect.BybitBrokerage/Models/BybitOpenInterestInfo.cs b/QuantConnect.BybitBrokerage/Models/BybitOpenInterestInfo.cs
index e1b8682..fa3e596 100644
--- a/QuantConnect.BybitBrokerage/Models/BybitOpenInterestInfo.cs
+++ b/QuantConnect.BybitBrokerage/Models/BybitOpenInterestInfo.cs
@@ -15,9 +15,9 @@
 
 using System;
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Converters;
+using QuantConnect.Brokerages.Bybit.Converters;
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Bybit open interest info
diff --git a/QuantConnect.BybitBrokerage/Models/BybitOrder.cs b/QuantConnect.BybitBrokerage/Models/BybitOrder.cs
index 3f29fd7..2a24196 100644
--- a/QuantConnect.BybitBrokerage/Models/BybitOrder.cs
+++ b/QuantConnect.BybitBrokerage/Models/BybitOrder.cs
@@ -15,10 +15,10 @@
 
 using System;
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Order info
diff --git a/QuantConnect.BybitBrokerage/Models/BybitOrderBookRow.cs b/QuantConnect.BybitBrokerage/Models/BybitOrderBookRow.cs
index 8b4d7e5..6c9dcac 100644
--- a/QuantConnect.BybitBrokerage/Models/BybitOrderBookRow.cs
+++ b/QuantConnect.BybitBrokerage/Models/BybitOrderBookRow.cs
@@ -14,9 +14,9 @@
 */
 
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Converters;
+using QuantConnect.Brokerages.Bybit.Converters;
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Bybit order book row
diff --git a/QuantConnect.BybitBrokerage/Models/BybitOrderBookUpdate.cs b/QuantConnect.BybitBrokerage/Models/BybitOrderBookUpdate.cs
index 4e33474..9ed34a1 100644
--- a/QuantConnect.BybitBrokerage/Models/BybitOrderBookUpdate.cs
+++ b/QuantConnect.BybitBrokerage/Models/BybitOrderBookUpdate.cs
@@ -15,7 +15,7 @@
 
 using Newtonsoft.Json;
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Bybit order book update
diff --git a/QuantConnect.BybitBrokerage/Models/BybitPageResult.cs b/QuantConnect.BybitBrokerage/Models/BybitPageResult.cs
index 36eb7ac..238571d 100644
--- a/QuantConnect.BybitBrokerage/Models/BybitPageResult.cs
+++ b/QuantConnect.BybitBrokerage/Models/BybitPageResult.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Bybit business data wrapper for results with pagination support
diff --git a/QuantConnect.BybitBrokerage/Models/BybitPositionInfo.cs b/QuantConnect.BybitBrokerage/Models/BybitPositionInfo.cs
index 9bbab60..33d4715 100644
--- a/QuantConnect.BybitBrokerage/Models/BybitPositionInfo.cs
+++ b/QuantConnect.BybitBrokerage/Models/BybitPositionInfo.cs
@@ -14,9 +14,9 @@
 */
 
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Position info
diff --git a/QuantConnect.BybitBrokerage/Models/BybitTicker.cs b/QuantConnect.BybitBrokerage/Models/BybitTicker.cs
index e5fd6fb..ddf82fe 100644
--- a/QuantConnect.BybitBrokerage/Models/BybitTicker.cs
+++ b/QuantConnect.BybitBrokerage/Models/BybitTicker.cs
@@ -15,9 +15,9 @@
 
 using System;
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Converters;
+using QuantConnect.Brokerages.Bybit.Converters;
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// Ticker info
diff --git a/QuantConnect.BybitBrokerage/Models/BybitTrade.cs b/QuantConnect.BybitBrokerage/Models/BybitTrade.cs
index 4644039..c8e3377 100644
--- a/QuantConnect.BybitBrokerage/Models/BybitTrade.cs
+++ b/QuantConnect.BybitBrokerage/Models/BybitTrade.cs
@@ -15,10 +15,10 @@
 
 using System;
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 
-namespace QuantConnect.BybitBrokerage.Models;
+namespace QuantConnect.Brokerages.Bybit.Models;
 
 /// <summary>
 /// User trade info
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/BybitAccountType.cs b/QuantConnect.BybitBrokerage/Models/Enums/BybitAccountType.cs
index 7a4b8de..9d6a594 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/BybitAccountType.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/BybitAccountType.cs
@@ -15,7 +15,7 @@
 
 using System.Runtime.Serialization;
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Bybit account type
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/BybitMessageType.cs b/QuantConnect.BybitBrokerage/Models/Enums/BybitMessageType.cs
index 493947e..1cecaa8 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/BybitMessageType.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/BybitMessageType.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models.Messages;
+namespace QuantConnect.Brokerages.Bybit.Models.Messages;
 
 /// <summary>
 /// Websocket message type
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/BybitProductCategory.cs b/QuantConnect.BybitBrokerage/Models/Enums/BybitProductCategory.cs
index 7d43ca6..ceb7e82 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/BybitProductCategory.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/BybitProductCategory.cs
@@ -15,7 +15,7 @@
 
 using System.Runtime.Serialization;
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Bybit product type
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/BybitVIPLevel.cs b/QuantConnect.BybitBrokerage/Models/Enums/BybitVIPLevel.cs
index 895ab57..7f2d40b 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/BybitVIPLevel.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/BybitVIPLevel.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Bybit VIP Levels
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/CancelType.cs b/QuantConnect.BybitBrokerage/Models/Enums/CancelType.cs
index 0e6eabe..533f399 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/CancelType.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/CancelType.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Cancel type
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/DCPStatus.cs b/QuantConnect.BybitBrokerage/Models/Enums/DCPStatus.cs
index 276025b..aac0ece 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/DCPStatus.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/DCPStatus.cs
@@ -15,7 +15,7 @@
 
 using System.Runtime.Serialization;
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Disconnect cancel all status
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/ExecutionType.cs b/QuantConnect.BybitBrokerage/Models/Enums/ExecutionType.cs
index 9dcde3b..a53a91a 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/ExecutionType.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/ExecutionType.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Trade execution type
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/MarginMode.cs b/QuantConnect.BybitBrokerage/Models/Enums/MarginMode.cs
index 4cfcaab..3d41c75 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/MarginMode.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/MarginMode.cs
@@ -15,7 +15,7 @@
 
 using System.Runtime.Serialization;
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Margin mode
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/MarginTradingSupport.cs b/QuantConnect.BybitBrokerage/Models/Enums/MarginTradingSupport.cs
index a4f5997..a1cdad8 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/MarginTradingSupport.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/MarginTradingSupport.cs
@@ -15,7 +15,7 @@
 
 using System.Runtime.Serialization;
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Margin trading support for securities
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/OrderFilter.cs b/QuantConnect.BybitBrokerage/Models/Enums/OrderFilter.cs
index e157adc..1153439 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/OrderFilter.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/OrderFilter.cs
@@ -15,7 +15,7 @@
 
 using System.Runtime.Serialization;
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Order filter
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/OrderSide.cs b/QuantConnect.BybitBrokerage/Models/Enums/OrderSide.cs
index 8dab2cf..2d754e1 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/OrderSide.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/OrderSide.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Order side
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/OrderStatus.cs b/QuantConnect.BybitBrokerage/Models/Enums/OrderStatus.cs
index 22cdb97..96cf2d7 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/OrderStatus.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/OrderStatus.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Order Status
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/OrderType.cs b/QuantConnect.BybitBrokerage/Models/Enums/OrderType.cs
index c5fe01a..604160a 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/OrderType.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/OrderType.cs
@@ -15,7 +15,7 @@
 
 using System.Runtime.Serialization;
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Order types
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/PositionIndex.cs b/QuantConnect.BybitBrokerage/Models/Enums/PositionIndex.cs
index fc0642c..57f9737 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/PositionIndex.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/PositionIndex.cs
@@ -15,7 +15,7 @@
 
 using System.Runtime.Serialization;
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Position index, used to identify positions in different position modes
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/PositionSide.cs b/QuantConnect.BybitBrokerage/Models/Enums/PositionSide.cs
index 5caa9e5..3adbcfd 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/PositionSide.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/PositionSide.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Position side
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/PositionStatus.cs b/QuantConnect.BybitBrokerage/Models/Enums/PositionStatus.cs
index 0ce4c3b..4090d1e 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/PositionStatus.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/PositionStatus.cs
@@ -15,7 +15,7 @@
 
 using System.Runtime.Serialization;
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Position status
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/StopOrderType.cs b/QuantConnect.BybitBrokerage/Models/Enums/StopOrderType.cs
index 252a06b..271f0b0 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/StopOrderType.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/StopOrderType.cs
@@ -15,7 +15,7 @@
 
 using System.Runtime.Serialization;
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Stop order type
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/TickDirection.cs b/QuantConnect.BybitBrokerage/Models/Enums/TickDirection.cs
index 3c1c977..a6d7b7c 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/TickDirection.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/TickDirection.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Tick direction
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/TimeInForce.cs b/QuantConnect.BybitBrokerage/Models/Enums/TimeInForce.cs
index 603ea89..40a0a41 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/TimeInForce.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/TimeInForce.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Time in force
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/TriggerDirection.cs b/QuantConnect.BybitBrokerage/Models/Enums/TriggerDirection.cs
index e17d313..a616384 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/TriggerDirection.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/TriggerDirection.cs
@@ -15,7 +15,7 @@
 
 using System.Runtime.Serialization;
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Conditional order trigger direction
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/TriggerType.cs b/QuantConnect.BybitBrokerage/Models/Enums/TriggerType.cs
index f7daaf4..f3ee9f8 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/TriggerType.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/TriggerType.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Trigger type
diff --git a/QuantConnect.BybitBrokerage/Models/Enums/UnifiedMarginStatus.cs b/QuantConnect.BybitBrokerage/Models/Enums/UnifiedMarginStatus.cs
index ee3946e..d3f2cb9 100644
--- a/QuantConnect.BybitBrokerage/Models/Enums/UnifiedMarginStatus.cs
+++ b/QuantConnect.BybitBrokerage/Models/Enums/UnifiedMarginStatus.cs
@@ -15,7 +15,7 @@
 
 using System.Runtime.Serialization;
 
-namespace QuantConnect.BybitBrokerage.Models.Enums;
+namespace QuantConnect.Brokerages.Bybit.Models.Enums;
 
 /// <summary>
 /// Bybit account unified margin status
diff --git a/QuantConnect.BybitBrokerage/Models/Messages/BybitDataMessage.cs b/QuantConnect.BybitBrokerage/Models/Messages/BybitDataMessage.cs
index 68129e6..7142fa1 100644
--- a/QuantConnect.BybitBrokerage/Models/Messages/BybitDataMessage.cs
+++ b/QuantConnect.BybitBrokerage/Models/Messages/BybitDataMessage.cs
@@ -15,9 +15,9 @@
 
 using System;
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Converters;
+using QuantConnect.Brokerages.Bybit.Converters;
 
-namespace QuantConnect.BybitBrokerage.Models.Messages;
+namespace QuantConnect.Brokerages.Bybit.Models.Messages;
 
 /// <summary>
 /// Base websocket data message
diff --git a/QuantConnect.BybitBrokerage/Models/Messages/BybitMessage.cs b/QuantConnect.BybitBrokerage/Models/Messages/BybitMessage.cs
index 3b1c204..8cef13b 100644
--- a/QuantConnect.BybitBrokerage/Models/Messages/BybitMessage.cs
+++ b/QuantConnect.BybitBrokerage/Models/Messages/BybitMessage.cs
@@ -15,7 +15,7 @@
 
 using Newtonsoft.Json;
 
-namespace QuantConnect.BybitBrokerage.Models.Messages;
+namespace QuantConnect.Brokerages.Bybit.Models.Messages;
 
 
 /// <summary>
diff --git a/QuantConnect.BybitBrokerage/Models/Messages/BybitOrderUpdate.cs b/QuantConnect.BybitBrokerage/Models/Messages/BybitOrderUpdate.cs
index 25803bb..05df8ef 100644
--- a/QuantConnect.BybitBrokerage/Models/Messages/BybitOrderUpdate.cs
+++ b/QuantConnect.BybitBrokerage/Models/Messages/BybitOrderUpdate.cs
@@ -13,9 +13,9 @@
  * limitations under the License.
 */
 
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 
-namespace QuantConnect.BybitBrokerage.Models.Messages;
+namespace QuantConnect.Brokerages.Bybit.Models.Messages;
 
 /// <summary>
 /// Order update
diff --git a/QuantConnect.BybitBrokerage/Models/Messages/BybitTickUpdate.cs b/QuantConnect.BybitBrokerage/Models/Messages/BybitTickUpdate.cs
index baaad46..9045c7c 100644
--- a/QuantConnect.BybitBrokerage/Models/Messages/BybitTickUpdate.cs
+++ b/QuantConnect.BybitBrokerage/Models/Messages/BybitTickUpdate.cs
@@ -15,10 +15,10 @@
 
 using System;
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 
-namespace QuantConnect.BybitBrokerage.Models.Messages;
+namespace QuantConnect.Brokerages.Bybit.Models.Messages;
 
 
 /// <summary>
diff --git a/QuantConnect.BybitBrokerage/Models/Messages/BybitTradeUpdate.cs b/QuantConnect.BybitBrokerage/Models/Messages/BybitTradeUpdate.cs
index d077856..83daa2b 100644
--- a/QuantConnect.BybitBrokerage/Models/Messages/BybitTradeUpdate.cs
+++ b/QuantConnect.BybitBrokerage/Models/Messages/BybitTradeUpdate.cs
@@ -13,9 +13,9 @@
  * limitations under the License.
 */
 
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 
-namespace QuantConnect.BybitBrokerage.Models.Messages;
+namespace QuantConnect.Brokerages.Bybit.Models.Messages;
 
 
 /// <summary>
diff --git a/QuantConnect.BybitBrokerage/Models/Requests/ByBitCancelOrderRequest.cs b/QuantConnect.BybitBrokerage/Models/Requests/ByBitCancelOrderRequest.cs
index 13f1f2c..82f49f4 100644
--- a/QuantConnect.BybitBrokerage/Models/Requests/ByBitCancelOrderRequest.cs
+++ b/QuantConnect.BybitBrokerage/Models/Requests/ByBitCancelOrderRequest.cs
@@ -13,9 +13,9 @@
  * limitations under the License.
 */
 
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 
-namespace QuantConnect.BybitBrokerage.Models.Requests;
+namespace QuantConnect.Brokerages.Bybit.Models.Requests;
 
 /// <summary>
 /// Bybit cancel order api request
diff --git a/QuantConnect.BybitBrokerage/Models/Requests/ByBitPlaceOrderRequest.cs b/QuantConnect.BybitBrokerage/Models/Requests/ByBitPlaceOrderRequest.cs
index b8588f0..e530a4f 100644
--- a/QuantConnect.BybitBrokerage/Models/Requests/ByBitPlaceOrderRequest.cs
+++ b/QuantConnect.BybitBrokerage/Models/Requests/ByBitPlaceOrderRequest.cs
@@ -14,10 +14,10 @@
 */
 
 using Newtonsoft.Json;
-using QuantConnect.BybitBrokerage.Converters;
-using QuantConnect.BybitBrokerage.Models.Enums;
+using QuantConnect.Brokerages.Bybit.Converters;
+using QuantConnect.Brokerages.Bybit.Models.Enums;
 
-namespace QuantConnect.BybitBrokerage.Models.Requests;
+namespace QuantConnect.Brokerages.Bybit.Models.Requests;
 
 /// <summary>
 /// Bybit place order api request
diff --git a/QuantConnect.BybitBrokerage/Models/Requests/ByBitUpdateOrderRequest.cs b/QuantConnect.BybitBrokerage/Models/Requests/ByBitUpdateOrderRequest.cs
index 543f486..fe4227b 100644
--- a/QuantConnect.BybitBrokerage/Models/Requests/ByBitUpdateOrderRequest.cs
+++ b/QuantConnect.BybitBrokerage/Models/Requests/ByBitUpdateOrderRequest.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models.Requests;
+namespace QuantConnect.Brokerages.Bybit.Models.Requests;
 
 /// <summary>
 /// Bybit update order api request
diff --git a/QuantConnect.BybitBrokerage/Models/Requests/BybitPlaceOrderResponse.cs b/QuantConnect.BybitBrokerage/Models/Requests/BybitPlaceOrderResponse.cs
index 8c7cd7d..ae35394 100644
--- a/QuantConnect.BybitBrokerage/Models/Requests/BybitPlaceOrderResponse.cs
+++ b/QuantConnect.BybitBrokerage/Models/Requests/BybitPlaceOrderResponse.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
 */
 
-namespace QuantConnect.BybitBrokerage.Models.Requests;
+namespace QuantConnect.Brokerages.Bybit.Models.Requests;
 
 /// <summary>
 /// Bybit update order api response
diff --git a/QuantConnect.BybitBrokerage/QuantConnect.BybitBrokerage.csproj b/QuantConnect.BybitBrokerage/QuantConnect.BybitBrokerage.csproj
index ffa6597..35ce40b 100644
--- a/QuantConnect.BybitBrokerage/QuantConnect.BybitBrokerage.csproj
+++ b/QuantConnect.BybitBrokerage/QuantConnect.BybitBrokerage.csproj
@@ -3,27 +3,27 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <TargetFramework>net6.0</TargetFramework>
-    <Product>QuantConnect.BybitBrokerage</Product>
-    <RootNamespace>QuantConnect.BybitBrokerage</RootNamespace>
-    <AssemblyTitle>QuantConnect.BybitBrokerage</AssemblyTitle>
-    <AssemblyName>QuantConnect.BybitBrokerage</AssemblyName>
+    <Product>QuantConnect.Brokerages.Bybit</Product>
+    <RootNamespace>QuantConnect.Brokerages.Bybit</RootNamespace>
+    <AssemblyTitle>QuantConnect.Brokerages.Bybit</AssemblyTitle>
+    <AssemblyName>QuantConnect.Brokerages.Bybit</AssemblyName>
     <OutputType>Library</OutputType>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Description>QuantConnect LEAN Bybit Brokerage: Bybit Brokerage plugin for Lean</Description>
-    <PackageId>QuantConnect.BybitBrokerage</PackageId>
+    <PackageId>QuantConnect.Brokerages.Bybit</PackageId>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>bin\Debug\QuantConnect.BybitBrokerage.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\QuantConnect.Brokerages.Bybit.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>bin\Release\QuantConnect.BybitBrokerage.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\QuantConnect.Brokerages.Bybit.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\Lean\Common\Properties\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />