diff --git a/src/HeboTech.ATLib.Modems.Tests/HeboTech.ATLib.Modems.Tests.csproj b/src/HeboTech.ATLib.Modems.Tests/HeboTech.ATLib.Modems.Tests.csproj
deleted file mode 100644
index 064afc6..0000000
--- a/src/HeboTech.ATLib.Modems.Tests/HeboTech.ATLib.Modems.Tests.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\HeboTech.ATLib.Modems\HeboTech.ATLib.Modems.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Xunit" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/HeboTech.ATLib.Modems/HeboTech.ATLib.Modems.csproj b/src/HeboTech.ATLib.Modems/HeboTech.ATLib.Modems.csproj
deleted file mode 100644
index f5b02f5..0000000
--- a/src/HeboTech.ATLib.Modems/HeboTech.ATLib.Modems.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0;net8.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\HeboTech.ATLib\HeboTech.ATLib.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/HeboTech.ATLib.TestConsole/FunctionalityTest.cs b/src/HeboTech.ATLib.TestConsole/FunctionalityTest.cs
index 6732add..0d6081f 100644
--- a/src/HeboTech.ATLib.TestConsole/FunctionalityTest.cs
+++ b/src/HeboTech.ATLib.TestConsole/FunctionalityTest.cs
@@ -1,15 +1,16 @@
 using HeboTech.ATLib.Events;
 using HeboTech.ATLib.Messaging;
-using HeboTech.ATLib.Modems.D_LINK;
+using HeboTech.ATLib.Misc;
+using HeboTech.ATLib.Modems;
+using HeboTech.ATLib.Modems.Adafruit;
+using HeboTech.ATLib.Modems.Cinterion;
 using HeboTech.ATLib.Numbering;
 using HeboTech.ATLib.Parsing;
 using HeboTech.ATLib.Storage;
-using HeboTech.ATLib.Misc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using HeboTech.ATLib.Modems.Cinterion;
 
 namespace HeboTech.ATLib.TestConsole
 {
@@ -39,8 +40,7 @@ public static async Task RunAsync(System.IO.Stream stream, string pin)
         {
             using AtChannel atChannel = AtChannel.Create(stream);
             atChannel.EnableDebug(Log);
-            //using IMC55i modem = new MC55i(atChannel);
-            using IDWM222 modem = new DWM222(atChannel);
+            using IModem modem = new MC55i(atChannel);
             atChannel.Open();
             await atChannel.ClearAsync();
 
@@ -129,7 +129,8 @@ public static async Task RunAsync(System.IO.Stream stream, string pin)
             Console.WriteLine($"Supported storages:{Environment.NewLine}{supportedStorages}");
             var currentStorages = await modem.GetPreferredMessageStoragesAsync();
             Console.WriteLine($"Current storages:{Environment.NewLine}{currentStorages}");
-            var setPreferredStorages = await modem.SetPreferredMessageStorageAsync(MessageStorage.MT, MessageStorage.MT, MessageStorage.MT);
+            //var setPreferredStorages = await modem.SetPreferredMessageStorageAsync(MessageStorage.MT, MessageStorage.MT, MessageStorage.MT);
+            var setPreferredStorages = await modem.SetPreferredMessageStorageAsync(MessageStorage.ME, MessageStorage.ME, MessageStorage.ME);
             Console.WriteLine($"Storages set:{Environment.NewLine}{setPreferredStorages}");
 
             Log("Initialization done");
diff --git a/src/HeboTech.ATLib.TestConsole/GetStartedExample.cs b/src/HeboTech.ATLib.TestConsole/GetStartedExample.cs
index 5fa599b..b084770 100644
--- a/src/HeboTech.ATLib.TestConsole/GetStartedExample.cs
+++ b/src/HeboTech.ATLib.TestConsole/GetStartedExample.cs
@@ -1,5 +1,6 @@
 using HeboTech.ATLib.Messaging;
 using HeboTech.ATLib.Misc;
+using HeboTech.ATLib.Modems;
 using HeboTech.ATLib.Modems.Adafruit;
 using HeboTech.ATLib.Numbering;
 using HeboTech.ATLib.Parsing;
diff --git a/src/HeboTech.ATLib.TestConsole/StressTest.cs b/src/HeboTech.ATLib.TestConsole/StressTest.cs
index ea26ba5..cfe0038 100644
--- a/src/HeboTech.ATLib.TestConsole/StressTest.cs
+++ b/src/HeboTech.ATLib.TestConsole/StressTest.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using HeboTech.ATLib.Modems;
 
 namespace HeboTech.ATLib.TestConsole
 {
diff --git a/src/HeboTech.ATLib.sln b/src/HeboTech.ATLib.sln
index e2c83fd..4589cc3 100644
--- a/src/HeboTech.ATLib.sln
+++ b/src/HeboTech.ATLib.sln
@@ -9,10 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HeboTech.ATLib.TestConsole"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HeboTech.ATLib.Tests", "HeboTech.ATLib.Tests\HeboTech.ATLib.Tests.csproj", "{97A95146-06D3-436E-AE16-8F0A6D86B26D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeboTech.ATLib.Modems", "HeboTech.ATLib.Modems\HeboTech.ATLib.Modems.csproj", "{077CEEEB-C9D1-4719-85FC-A46DC591E755}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeboTech.ATLib.Modems.Tests", "HeboTech.ATLib.Modems.Tests\HeboTech.ATLib.Modems.Tests.csproj", "{F2DE5265-0B3F-418B-8725-35B0A880F23A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,14 +27,6 @@ Global
 		{97A95146-06D3-436E-AE16-8F0A6D86B26D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{97A95146-06D3-436E-AE16-8F0A6D86B26D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{97A95146-06D3-436E-AE16-8F0A6D86B26D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{077CEEEB-C9D1-4719-85FC-A46DC591E755}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{077CEEEB-C9D1-4719-85FC-A46DC591E755}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{077CEEEB-C9D1-4719-85FC-A46DC591E755}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{077CEEEB-C9D1-4719-85FC-A46DC591E755}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2DE5265-0B3F-418B-8725-35B0A880F23A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2DE5265-0B3F-418B-8725-35B0A880F23A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2DE5265-0B3F-418B-8725-35B0A880F23A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2DE5265-0B3F-418B-8725-35B0A880F23A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/HeboTech.ATLib.Modems/Adafruit/Fona3G.cs b/src/HeboTech.ATLib/Modems/Adafruit/Fona3G.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/Adafruit/Fona3G.cs
rename to src/HeboTech.ATLib/Modems/Adafruit/Fona3G.cs
diff --git a/src/HeboTech.ATLib.Modems/Adafruit/IFona3G.cs b/src/HeboTech.ATLib/Modems/Adafruit/IFona3G.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/Adafruit/IFona3G.cs
rename to src/HeboTech.ATLib/Modems/Adafruit/IFona3G.cs
diff --git a/src/HeboTech.ATLib.Modems/Cinterion/IMC55i.cs b/src/HeboTech.ATLib/Modems/Cinterion/IMC55i.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/Cinterion/IMC55i.cs
rename to src/HeboTech.ATLib/Modems/Cinterion/IMC55i.cs
diff --git a/src/HeboTech.ATLib.Modems/Cinterion/MC55i.cs b/src/HeboTech.ATLib/Modems/Cinterion/MC55i.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/Cinterion/MC55i.cs
rename to src/HeboTech.ATLib/Modems/Cinterion/MC55i.cs
diff --git a/src/HeboTech.ATLib.Modems/Cinterion/MC55iBatteryStatus.cs b/src/HeboTech.ATLib/Modems/Cinterion/MC55iBatteryStatus.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/Cinterion/MC55iBatteryStatus.cs
rename to src/HeboTech.ATLib/Modems/Cinterion/MC55iBatteryStatus.cs
diff --git a/src/HeboTech.ATLib.Modems/D_LINK/DWM222.cs b/src/HeboTech.ATLib/Modems/D_LINK/DWM222.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/D_LINK/DWM222.cs
rename to src/HeboTech.ATLib/Modems/D_LINK/DWM222.cs
diff --git a/src/HeboTech.ATLib.Modems/D_LINK/IDWM222.cs b/src/HeboTech.ATLib/Modems/D_LINK/IDWM222.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/D_LINK/IDWM222.cs
rename to src/HeboTech.ATLib/Modems/D_LINK/IDWM222.cs
diff --git a/src/HeboTech.ATLib.Modems/Generic/ModemBase.cs b/src/HeboTech.ATLib/Modems/Generic/ModemBase.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/Generic/ModemBase.cs
rename to src/HeboTech.ATLib/Modems/Generic/ModemBase.cs
diff --git a/src/HeboTech.ATLib/IModem.cs b/src/HeboTech.ATLib/Modems/IModem.cs
similarity index 99%
rename from src/HeboTech.ATLib/IModem.cs
rename to src/HeboTech.ATLib/Modems/IModem.cs
index da29f22..1148295 100644
--- a/src/HeboTech.ATLib/IModem.cs
+++ b/src/HeboTech.ATLib/Modems/IModem.cs
@@ -8,7 +8,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace HeboTech.ATLib
+namespace HeboTech.ATLib.Modems
 {
     public interface IModem : IDisposable
     {
diff --git a/src/HeboTech.ATLib.Modems/Qualcomm/IMDM9225.cs b/src/HeboTech.ATLib/Modems/Qualcomm/IMDM9225.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/Qualcomm/IMDM9225.cs
rename to src/HeboTech.ATLib/Modems/Qualcomm/IMDM9225.cs
diff --git a/src/HeboTech.ATLib.Modems/Qualcomm/MDM9225.cs b/src/HeboTech.ATLib/Modems/Qualcomm/MDM9225.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/Qualcomm/MDM9225.cs
rename to src/HeboTech.ATLib/Modems/Qualcomm/MDM9225.cs
diff --git a/src/HeboTech.ATLib.Modems/SIMCOM/ISIM5320.cs b/src/HeboTech.ATLib/Modems/SIMCOM/ISIM5320.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/SIMCOM/ISIM5320.cs
rename to src/HeboTech.ATLib/Modems/SIMCOM/ISIM5320.cs
diff --git a/src/HeboTech.ATLib.Modems/SIMCOM/SIM5320.cs b/src/HeboTech.ATLib/Modems/SIMCOM/SIM5320.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/SIMCOM/SIM5320.cs
rename to src/HeboTech.ATLib/Modems/SIMCOM/SIM5320.cs
diff --git a/src/HeboTech.ATLib.Modems/TP-LINK/IMA260.cs b/src/HeboTech.ATLib/Modems/TP-LINK/IMA260.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/TP-LINK/IMA260.cs
rename to src/HeboTech.ATLib/Modems/TP-LINK/IMA260.cs
diff --git a/src/HeboTech.ATLib.Modems/TP-LINK/MA260.cs b/src/HeboTech.ATLib/Modems/TP-LINK/MA260.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/TP-LINK/MA260.cs
rename to src/HeboTech.ATLib/Modems/TP-LINK/MA260.cs
diff --git a/src/HeboTech.ATLib.Modems/Telit/IME910C1.cs b/src/HeboTech.ATLib/Modems/Telit/IME910C1.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/Telit/IME910C1.cs
rename to src/HeboTech.ATLib/Modems/Telit/IME910C1.cs
diff --git a/src/HeboTech.ATLib.Modems/Telit/ME910C1.cs b/src/HeboTech.ATLib/Modems/Telit/ME910C1.cs
similarity index 100%
rename from src/HeboTech.ATLib.Modems/Telit/ME910C1.cs
rename to src/HeboTech.ATLib/Modems/Telit/ME910C1.cs