Refactor EVERYTHING

Directories structure + namespaces relevant to them

ArchiSteamFarm.CustomPlugins.ExamplePlugin/CatController.cs

@@ -22,6 +22,7 @@
 using System;
 using System.Net;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.IPC.Controllers.Api;
 using ArchiSteamFarm.IPC.Responses;
 using Microsoft.AspNetCore.Mvc;

ArchiSteamFarm.CustomPlugins.ExamplePlugin/ExamplePlugin.cs

@@ -27,8 +27,11 @@ using System.Collections.Generic;
 using System.Composition;
 using System.Linq;
 using System.Threading.Tasks;
-using ArchiSteamFarm.Json;
+using ArchiSteamFarm.Core;
-using ArchiSteamFarm.Plugins;
+using ArchiSteamFarm.Plugins.Interfaces;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Steam.Data;
+using ArchiSteamFarm.Steam.Storage;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SteamKit2;

ArchiSteamFarm.CustomPlugins.PeriodicGC/PeriodicGCPlugin.cs

@@ -24,7 +24,8 @@ using System.Composition;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime;
 using System.Threading;
-using ArchiSteamFarm.Plugins;
+using ArchiSteamFarm.Core;
+using ArchiSteamFarm.Plugins.Interfaces;
 
 namespace ArchiSteamFarm.CustomPlugins.PeriodicGC {
 	[Export(typeof(IPlugin))]

ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/GlobalCache.cs

@@ -32,6 +32,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Helpers;
 using ArchiSteamFarm.Localization;
 using Newtonsoft.Json;

ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/RequestData.cs

@@ -23,6 +23,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Globalization;
+using ArchiSteamFarm.Core;
 using Newtonsoft.Json;
 using SteamKit2;
 

ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs

@@ -32,8 +32,11 @@ using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.OfficialPlugins.SteamTokenDumper.Localization;
 using ArchiSteamFarm.Plugins;
+using ArchiSteamFarm.Plugins.Interfaces;
+using ArchiSteamFarm.Steam;
 using ArchiSteamFarm.Web;
 using ArchiSteamFarm.Web.Responses;
 using Newtonsoft.Json;

ArchiSteamFarm.Tests/Bot.cs

@@ -25,7 +25,7 @@ using ArchiSteamFarm.RuntimeCompatibility;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using ArchiSteamFarm.Json;
+using ArchiSteamFarm.Steam.Data;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace ArchiSteamFarm.Tests {
@@ -36,8 +36,8 @@ namespace ArchiSteamFarm.Tests {
 			const uint relevantAppID = 42;
 
 			Dictionary<uint, byte> itemsPerSet = new() {
-				{ relevantAppID, ArchiSteamFarm.Bot.MinCardsPerBadge },
+				{ relevantAppID, Steam.Bot.MinCardsPerBadge },
-				{ 43, ArchiSteamFarm.Bot.MinCardsPerBadge + 1 }
+				{ 43, Steam.Bot.MinCardsPerBadge + 1 }
 			};
 
 			HashSet<Asset> items = new();
@@ -48,7 +48,7 @@ namespace ArchiSteamFarm.Tests {
 				}
 			}
 
-			HashSet<Asset> itemsToSend = GetItemsForFullBadge(items, itemsPerSet, ArchiSteamFarm.Bot.MinCardsPerBadge);
+			HashSet<Asset> itemsToSend = GetItemsForFullBadge(items, itemsPerSet, Steam.Bot.MinCardsPerBadge);
 
 			Dictionary<(uint RealAppID, ulong ContextID, ulong ClassID), uint> expectedResult = items.Where(item => item.RealAppID == relevantAppID)
 				.GroupBy(item => (item.RealAppID, item.ContextID, item.ClassID))
@@ -67,7 +67,7 @@ namespace ArchiSteamFarm.Tests {
 				CreateCard(2, appID)
 			};
 
-			GetItemsForFullBadge(items, 2, appID, ArchiSteamFarm.Bot.MinCardsPerBadge - 1);
+			GetItemsForFullBadge(items, 2, appID, Steam.Bot.MinCardsPerBadge - 1);
 
 			Assert.Fail();
 		}
@@ -428,14 +428,14 @@ namespace ArchiSteamFarm.Tests {
 
 			HashSet<Asset> items = new();
 
-			for (byte i = 0; i < ArchiSteamFarm.Trading.MaxItemsPerTrade; i++) {
+			for (byte i = 0; i < Steam.Exchange.Trading.MaxItemsPerTrade; i++) {
 				items.Add(CreateCard(1, appID));
 				items.Add(CreateCard(2, appID));
 			}
 
 			HashSet<Asset> itemsToSend = GetItemsForFullBadge(items, 2, appID);
 
-			Assert.IsTrue(itemsToSend.Count <= ArchiSteamFarm.Trading.MaxItemsPerTrade);
+			Assert.IsTrue(itemsToSend.Count <= Steam.Exchange.Trading.MaxItemsPerTrade);
 		}
 
 		[TestMethod]
@@ -459,7 +459,7 @@ namespace ArchiSteamFarm.Tests {
 
 			HashSet<Asset> itemsToSend = GetItemsForFullBadge(items, itemsPerSet);
 
-			Assert.IsTrue(itemsToSend.Count <= ArchiSteamFarm.Trading.MaxItemsPerTrade);
+			Assert.IsTrue(itemsToSend.Count <= Steam.Exchange.Trading.MaxItemsPerTrade);
 		}
 
 		[TestMethod]
@@ -503,12 +503,12 @@ namespace ArchiSteamFarm.Tests {
 
 		private static Asset CreateCard(ulong classID, uint realAppID, uint amount = 1, Asset.EType type = Asset.EType.TradingCard, Asset.ERarity rarity = Asset.ERarity.Common) => new(Asset.SteamAppID, Asset.SteamCommunityContextID, classID, amount, realAppID: realAppID, type: type, rarity: rarity);
 
-		private static HashSet<Asset> GetItemsForFullBadge(IReadOnlyCollection<Asset> inventory, byte cardsPerSet, uint appID, ushort maxItems = ArchiSteamFarm.Trading.MaxItemsPerTrade) => GetItemsForFullBadge(inventory, new Dictionary<uint, byte> { { appID, cardsPerSet } }, maxItems);
+		private static HashSet<Asset> GetItemsForFullBadge(IReadOnlyCollection<Asset> inventory, byte cardsPerSet, uint appID, ushort maxItems = Steam.Exchange.Trading.MaxItemsPerTrade) => GetItemsForFullBadge(inventory, new Dictionary<uint, byte> { { appID, cardsPerSet } }, maxItems);
 
-		private static HashSet<Asset> GetItemsForFullBadge(IReadOnlyCollection<Asset> inventory, IDictionary<uint, byte> cardsPerSet, ushort maxItems = ArchiSteamFarm.Trading.MaxItemsPerTrade) {
+		private static HashSet<Asset> GetItemsForFullBadge(IReadOnlyCollection<Asset> inventory, IDictionary<uint, byte> cardsPerSet, ushort maxItems = Steam.Exchange.Trading.MaxItemsPerTrade) {
-			Dictionary<(uint RealAppID, Asset.EType Type, Asset.ERarity Rarity), List<uint>> inventorySets = ArchiSteamFarm.Trading.GetInventorySets(inventory);
+			Dictionary<(uint RealAppID, Asset.EType Type, Asset.ERarity Rarity), List<uint>> inventorySets = Steam.Exchange.Trading.GetInventorySets(inventory);
 
-			return ArchiSteamFarm.Bot.GetItemsForFullSets(inventory, inventorySets.ToDictionary(kv => kv.Key, kv => (SetsToExtract: inventorySets[kv.Key][0], cardsPerSet[kv.Key.RealAppID])), maxItems).ToHashSet();
+			return Steam.Bot.GetItemsForFullSets(inventory, inventorySets.ToDictionary(kv => kv.Key, kv => (SetsToExtract: inventorySets[kv.Key][0], cardsPerSet[kv.Key.RealAppID])), maxItems).ToHashSet();
 		}
 	}
 }

ArchiSteamFarm.Tests/Trading.cs

@@ -20,9 +20,9 @@
 // limitations under the License.
 
 using System.Collections.Generic;
-using ArchiSteamFarm.Json;
+using ArchiSteamFarm.Steam.Data;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using static ArchiSteamFarm.Trading;
+using static ArchiSteamFarm.Steam.Exchange.Trading;
 
 namespace ArchiSteamFarm.Tests {
 	[TestClass]

ArchiSteamFarm/Collections/FixedSizeConcurrentQueue.cs

@@ -23,6 +23,7 @@ using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using ArchiSteamFarm.Core;
 
 namespace ArchiSteamFarm.Collections {
 	internal sealed class FixedSizeConcurrentQueue<T> : IEnumerable<T> {

ArchiSteamFarm/Core/ASF.cs

@@ -44,13 +44,16 @@ using ArchiSteamFarm.IPC;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.NLog;
 using ArchiSteamFarm.Plugins;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Steam.Integration;
+using ArchiSteamFarm.Storage;
 using ArchiSteamFarm.Web;
 using ArchiSteamFarm.Web.Responses;
 using JetBrains.Annotations;
 using SteamKit2;
 using SteamKit2.Discovery;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Core {
 	public static class ASF {
 		// This is based on internal Valve guidelines, we're not using it as a hard limit
 		private const byte MaximumRecommendedBotsCount = 10;

ArchiSteamFarm/Core/Debugging.cs

@@ -22,7 +22,7 @@
 using System;
 using SteamKit2;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Core {
 	internal static class Debugging {
 #if DEBUG
 		internal static bool IsDebugBuild => true;

ArchiSteamFarm/Core/Events.cs

@@ -22,8 +22,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Steam;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Core {
 	internal static class Events {
 		internal static async Task OnBotShutdown() {
 			if (Program.ProcessRequired || ((Bot.Bots != null) && Bot.Bots.Values.Any(bot => bot.KeepRunning))) {

ArchiSteamFarm/Core/OS.cs

@@ -34,9 +34,10 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Storage;
 using ArchiSteamFarm.Web;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Core {
 	internal static class OS {
 		// We need to keep this one assigned and not calculated on-demand
 		internal static readonly string ProcessFileName = Process.GetCurrentProcess().MainModule?.FileName ?? throw new InvalidOperationException(nameof(ProcessFileName));

ArchiSteamFarm/Core/Statistics.cs

@@ -31,13 +31,20 @@ using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using ArchiSteamFarm.Json;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Steam.Data;
+using ArchiSteamFarm.Steam.Exchange;
+using ArchiSteamFarm.Steam.Idling;
+using ArchiSteamFarm.Steam.Integration;
+using ArchiSteamFarm.Steam.Security;
+using ArchiSteamFarm.Steam.Storage;
+using ArchiSteamFarm.Storage;
 using ArchiSteamFarm.Web;
 using ArchiSteamFarm.Web.Responses;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Core {
 	internal sealed class Statistics : IAsyncDisposable {
 		private const ushort MaxItemsForFairBots = ArchiWebHandler.MaxItemsInSingleInventoryRequest * WebBrowser.MaxTries; // Determines which fair bots we'll deprioritize when matching due to excessive number of inventory requests they need to make, which are likely to fail in the process or cause excessive delays
 		private const byte MaxMatchedBotsHard = 40; // Determines how many bots we can attempt to match in total, where match attempt is equal to analyzing bot's inventory

ArchiSteamFarm/Core/Utilities.cs

@@ -29,12 +29,13 @@ using System.Threading;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
 using AngleSharp.XPath;
+using ArchiSteamFarm.Storage;
 using Humanizer;
 using Humanizer.Localisation;
 using JetBrains.Annotations;
 using SteamKit2;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Core {
 	public static class Utilities {
 		private const byte TimeoutForLongRunningTasksInSeconds = 60;
 

ArchiSteamFarm/Helpers/ArchiCryptoHelper.cs

@@ -26,10 +26,11 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
+using ArchiSteamFarm.Core;
 using CryptSharp.Utility;
 using SteamKit2;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Helpers {
 	public static class ArchiCryptoHelper {
 		private const byte DefaultHashLength = 32;
 		private const ushort SteamParentalPbkdf2Iterations = 10000;

ArchiSteamFarm/Helpers/CrossProcessFileBasedSemaphore.cs

@@ -26,6 +26,7 @@ using System.Runtime.InteropServices;
 using System.Security.AccessControl;
 using System.Threading;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
 
 namespace ArchiSteamFarm.Helpers {
 	internal sealed class CrossProcessFileBasedSemaphore : ICrossProcessSemaphore, IDisposable {

ArchiSteamFarm/Helpers/SerializableFile.cs

@@ -22,6 +22,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.RuntimeCompatibility;
 using Newtonsoft.Json;
 

ArchiSteamFarm/IPC/ArchiKestrel.cs

@@ -29,9 +29,11 @@ using Microsoft.Extensions.Hosting;
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.IPC.Controllers.Api;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.NLog;
+using ArchiSteamFarm.NLog.Targets;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;

ArchiSteamFarm/IPC/Controllers/Api/ASFController.cs

@@ -25,10 +25,13 @@ using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.IPC.Requests;
 using ArchiSteamFarm.IPC.Responses;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.RuntimeCompatibility;
+using ArchiSteamFarm.Steam.Interaction;
+using ArchiSteamFarm.Storage;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Linq;
 

ArchiSteamFarm/IPC/Controllers/Api/ArchiController.cs

@@ -21,6 +21,7 @@
 
 using System.Net;
 using ArchiSteamFarm.IPC.Responses;
+using ArchiSteamFarm.Storage;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;
 

ArchiSteamFarm/IPC/Controllers/Api/BotController.cs

@@ -29,10 +29,14 @@ using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using ArchiSteamFarm.Callbacks;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.IPC.Requests;
 using ArchiSteamFarm.IPC.Responses;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Steam.Integration.Callbacks;
+using ArchiSteamFarm.Steam.Security;
+using ArchiSteamFarm.Steam.Storage;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Linq;
 

ArchiSteamFarm/IPC/Controllers/Api/CommandController.cs

@@ -24,9 +24,12 @@ using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.IPC.Requests;
 using ArchiSteamFarm.IPC.Responses;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Storage;
 using Microsoft.AspNetCore.Mvc;
 
 namespace ArchiSteamFarm.IPC.Controllers.Api {

ArchiSteamFarm/IPC/Controllers/Api/NLogController.cs

@@ -32,9 +32,10 @@ using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.IPC.Responses;
 using ArchiSteamFarm.Localization;
-using ArchiSteamFarm.NLog;
+using ArchiSteamFarm.NLog.Targets;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;

ArchiSteamFarm/IPC/Controllers/Api/PluginsController.cs

@@ -24,6 +24,7 @@ using System.Collections.Generic;
 using System.Net;
 using ArchiSteamFarm.IPC.Responses;
 using ArchiSteamFarm.Plugins;
+using ArchiSteamFarm.Plugins.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 
 namespace ArchiSteamFarm.IPC.Controllers.Api {

ArchiSteamFarm/IPC/Controllers/Api/TypeController.cs

@@ -25,6 +25,7 @@ using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Reflection;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.IPC.Responses;
 using ArchiSteamFarm.Localization;
 using Microsoft.AspNetCore.Mvc;

ArchiSteamFarm/IPC/Integration/ApiAuthenticationMiddleware.cs

@@ -26,6 +26,9 @@ using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
+using ArchiSteamFarm.Helpers;
+using ArchiSteamFarm.Storage;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;

ArchiSteamFarm/IPC/Requests/ASFEncryptRequest.cs

@@ -21,6 +21,7 @@
 
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
+using ArchiSteamFarm.Helpers;
 using Newtonsoft.Json;
 
 namespace ArchiSteamFarm.IPC.Requests {

ArchiSteamFarm/IPC/Requests/ASFHashRequest.cs

@@ -21,6 +21,7 @@
 
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
+using ArchiSteamFarm.Helpers;
 using Newtonsoft.Json;
 
 namespace ArchiSteamFarm.IPC.Requests {

ArchiSteamFarm/IPC/Requests/ASFRequest.cs

@@ -21,6 +21,7 @@
 
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
+using ArchiSteamFarm.Storage;
 using Newtonsoft.Json;
 
 namespace ArchiSteamFarm.IPC.Requests {

ArchiSteamFarm/IPC/Requests/BotInputRequest.cs

@@ -20,6 +20,7 @@
 // limitations under the License.
 
 using System.Diagnostics.CodeAnalysis;
+using ArchiSteamFarm.Core;
 using Newtonsoft.Json;
 
 namespace ArchiSteamFarm.IPC.Requests {

ArchiSteamFarm/IPC/Requests/BotRequest.cs

@@ -21,6 +21,7 @@
 
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
+using ArchiSteamFarm.Steam.Storage;
 using Newtonsoft.Json;
 
 namespace ArchiSteamFarm.IPC.Requests {

ArchiSteamFarm/IPC/Requests/TwoFactorAuthenticationConfirmationsRequest.cs

@@ -25,7 +25,9 @@ using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Steam.Security;
 using Newtonsoft.Json;
 
 namespace ArchiSteamFarm.IPC.Requests {

ArchiSteamFarm/IPC/Responses/ASFResponse.cs

@@ -21,6 +21,7 @@
 
 using System;
 using System.ComponentModel.DataAnnotations;
+using ArchiSteamFarm.Storage;
 using Newtonsoft.Json;
 
 namespace ArchiSteamFarm.IPC.Responses {

ArchiSteamFarm/IPC/Startup.cs

@@ -32,9 +32,11 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Net;
 using System.Reflection;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.IPC.Integration;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.Plugins;
+using ArchiSteamFarm.Storage;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;

ArchiSteamFarm/NLog/ArchiLogger.cs

@@ -24,6 +24,7 @@ using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.RuntimeCompatibility;
 using JetBrains.Annotations;

ArchiSteamFarm/NLog/Logging.cs

@@ -28,8 +28,12 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using ArchiSteamFarm.Collections;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.IPC;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.NLog.Targets;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Storage;
 using NLog;
 using NLog.Config;
 using NLog.Targets;

ArchiSteamFarm/NLog/Targets/HistoryTarget.cs

@@ -22,11 +22,12 @@
 using System;
 using System.Collections.Generic;
 using ArchiSteamFarm.Collections;
+using ArchiSteamFarm.Core;
 using JetBrains.Annotations;
 using NLog;
 using NLog.Targets;
 
-namespace ArchiSteamFarm.NLog {
+namespace ArchiSteamFarm.NLog.Targets {
 	[Target(TargetName)]
 	internal sealed class HistoryTarget : TargetWithLayout {
 		internal const string TargetName = "History";

ArchiSteamFarm/NLog/Targets/SteamTarget.cs

@@ -26,13 +26,14 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Steam;
 using JetBrains.Annotations;
 using NLog;
 using NLog.Config;
 using NLog.Layouts;
 using NLog.Targets;
 
-namespace ArchiSteamFarm.NLog {
+namespace ArchiSteamFarm.NLog.Targets {
 	[SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
 	[Target(TargetName)]
 	internal sealed class SteamTarget : AsyncTaskTarget {

ArchiSteamFarm/Plugins/Interfaces/IASF.cs

@@ -24,7 +24,7 @@ using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IASF : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IBot.cs

@@ -19,9 +19,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using ArchiSteamFarm.Steam;
 using JetBrains.Annotations;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IBot : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IBotCardsFarmerInfo.cs

@@ -19,9 +19,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using ArchiSteamFarm.Steam;
 using JetBrains.Annotations;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IBotCardsFarmerInfo : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IBotCommand.cs

@@ -20,9 +20,11 @@
 // limitations under the License.
 
 using System.Threading.Tasks;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Storage;
 using JetBrains.Annotations;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IBotCommand : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IBotConnection.cs

@@ -19,10 +19,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using ArchiSteamFarm.Steam;
 using JetBrains.Annotations;
 using SteamKit2;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IBotConnection : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IBotFriendRequest.cs

@@ -20,9 +20,10 @@
 // limitations under the License.
 
 using System.Threading.Tasks;
+using ArchiSteamFarm.Steam;
 using JetBrains.Annotations;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IBotFriendRequest : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IBotMessage.cs

@@ -20,9 +20,11 @@
 // limitations under the License.
 
 using System.Threading.Tasks;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Storage;
 using JetBrains.Annotations;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IBotMessage : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IBotModules.cs

@@ -20,11 +20,12 @@
 // limitations under the License.
 
 using System.Collections.Generic;
+using ArchiSteamFarm.Steam;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IBotModules : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IBotSteamClient.cs

@@ -20,10 +20,11 @@
 // limitations under the License.
 
 using System.Collections.Generic;
+using ArchiSteamFarm.Steam;
 using JetBrains.Annotations;
 using SteamKit2;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IBotSteamClient : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IBotTradeOffer.cs

@@ -20,10 +20,11 @@
 // limitations under the License.
 
 using System.Threading.Tasks;
-using ArchiSteamFarm.Json;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Steam.Data;
 using JetBrains.Annotations;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IBotTradeOffer : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IBotTradeOfferResults.cs

@@ -20,9 +20,11 @@
 // limitations under the License.
 
 using System.Collections.Generic;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Steam.Exchange;
 using JetBrains.Annotations;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IBotTradeOfferResults : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IBotUserNotifications.cs

@@ -20,10 +20,11 @@
 // limitations under the License.
 
 using System.Collections.Generic;
-using ArchiSteamFarm.Callbacks;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Steam.Integration.Callbacks;
 using JetBrains.Annotations;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IBotUserNotifications : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IBotsComparer.cs

@@ -22,7 +22,7 @@
 using System;
 using JetBrains.Annotations;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IBotsComparer : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/ICrossProcessSemaphoreProvider.cs

@@ -23,7 +23,7 @@ using System.Threading.Tasks;
 using ArchiSteamFarm.Helpers;
 using JetBrains.Annotations;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface ICrossProcessSemaphoreProvider : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/IPlugin.cs

@@ -23,7 +23,7 @@ using System;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/Interfaces/ISteamPICSChanges.cs

@@ -24,7 +24,7 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using SteamKit2;
 
-namespace ArchiSteamFarm.Plugins {
+namespace ArchiSteamFarm.Plugins.Interfaces {
 	[PublicAPI]
 	public interface ISteamPICSChanges : IPlugin {
 		/// <summary>

ArchiSteamFarm/Plugins/OfficialPlugin.cs

@@ -20,6 +20,7 @@
 // limitations under the License.
 
 using System;
+using ArchiSteamFarm.Plugins.Interfaces;
 
 namespace ArchiSteamFarm.Plugins {
 	internal abstract class OfficialPlugin : IPlugin {

ArchiSteamFarm/Plugins/PluginsCore.cs

@@ -30,10 +30,14 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
-using ArchiSteamFarm.Callbacks;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Helpers;
-using ArchiSteamFarm.Json;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Plugins.Interfaces;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Steam.Data;
+using ArchiSteamFarm.Steam.Exchange;
+using ArchiSteamFarm.Steam.Integration.Callbacks;
 using Newtonsoft.Json.Linq;
 using SteamKit2;
 

ArchiSteamFarm/Program.cs

@@ -28,9 +28,14 @@ using System.IO;
 using System.Linq;
 using System.Resources;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
+using ArchiSteamFarm.Helpers;
 using ArchiSteamFarm.IPC;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.NLog;
+using ArchiSteamFarm.NLog.Targets;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Storage;
 using ArchiSteamFarm.Web;
 using Newtonsoft.Json;
 using NLog;

ArchiSteamFarm/SharedInfo.cs

@@ -22,6 +22,7 @@
 using System;
 using System.IO;
 using System.Reflection;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Plugins;
 using JetBrains.Annotations;
 

ArchiSteamFarm/Steam/Bot.cs

@@ -40,19 +40,28 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
-using ArchiSteamFarm.Callbacks;
 using ArchiSteamFarm.Collections;
-using ArchiSteamFarm.Json;
+using ArchiSteamFarm.Core;
+using ArchiSteamFarm.Helpers;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.NLog;
 using ArchiSteamFarm.Plugins;
+using ArchiSteamFarm.Steam.Data;
+using ArchiSteamFarm.Steam.Exchange;
+using ArchiSteamFarm.Steam.Idling;
+using ArchiSteamFarm.Steam.Integration;
+using ArchiSteamFarm.Steam.Integration.Callbacks;
+using ArchiSteamFarm.Steam.Interaction;
+using ArchiSteamFarm.Steam.Security;
+using ArchiSteamFarm.Steam.Storage;
+using ArchiSteamFarm.Storage;
 using ArchiSteamFarm.Web;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using SteamKit2;
 using SteamKit2.Internal;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam {
 	public sealed class Bot : IAsyncDisposable {
 		internal const ushort CallbackSleep = 500; // In milliseconds
 		internal const ushort MaxMessagePrefixLength = MaxMessageLength - ReservedMessageLength - 2; // 2 for a minimum of 2 characters (escape one and real one)

ArchiSteamFarm/Steam/Data/Asset.cs

@@ -23,11 +23,12 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Globalization;
+using ArchiSteamFarm.Core;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace ArchiSteamFarm.Json {
+namespace ArchiSteamFarm.Steam.Data {
 	// REF: https://developer.valvesoftware.com/wiki/Steam_Web_API/IEconService#CEcon_Asset
 	public sealed class Asset {
 		[PublicAPI]

ArchiSteamFarm/Steam/Data/BooleanResponse.cs

@@ -23,7 +23,7 @@ using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm.Json {
+namespace ArchiSteamFarm.Steam.Data {
 	[PublicAPI]
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
 	public class BooleanResponse {

ArchiSteamFarm/Steam/Data/EResultResponse.cs

@@ -24,7 +24,7 @@ using JetBrains.Annotations;
 using Newtonsoft.Json;
 using SteamKit2;
 
-namespace ArchiSteamFarm.Json {
+namespace ArchiSteamFarm.Steam.Data {
 	[PublicAPI]
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
 	public class EResultResponse {

ArchiSteamFarm/Steam/Data/InventoryResponse.cs

@@ -24,12 +24,13 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Localization;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace ArchiSteamFarm.Json {
+namespace ArchiSteamFarm.Steam.Data {
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
 	internal sealed class InventoryResponse : EResultResponse {
 		[JsonProperty(PropertyName = "assets", Required = Required.DisallowNull)]

ArchiSteamFarm/Steam/Data/NewDiscoveryQueueResponse.cs

@@ -23,7 +23,7 @@ using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm.Json {
+namespace ArchiSteamFarm.Steam.Data {
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
 	internal sealed class NewDiscoveryQueueResponse {
 		[JsonProperty(PropertyName = "queue", Required = Required.Always)]

ArchiSteamFarm/Steam/Data/RedeemWalletResponse.cs

@@ -23,7 +23,7 @@ using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
 using SteamKit2;
 
-namespace ArchiSteamFarm.Json {
+namespace ArchiSteamFarm.Steam.Data {
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
 	internal sealed class RedeemWalletResponse : EResultResponse {
 		[JsonProperty(PropertyName = "detail", Required = Required.DisallowNull)]

ArchiSteamFarm/Steam/Data/Tag.cs

@@ -23,7 +23,7 @@ using System;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm.Json {
+namespace ArchiSteamFarm.Steam.Data {
 	public sealed class Tag {
 		[JsonProperty(PropertyName = "category", Required = Required.Always)]
 		[PublicAPI]

ArchiSteamFarm/Steam/Data/TradeOffer.cs

@@ -26,7 +26,7 @@ using System.Linq;
 using JetBrains.Annotations;
 using SteamKit2;
 
-namespace ArchiSteamFarm.Json {
+namespace ArchiSteamFarm.Steam.Data {
 	// REF: https://developer.valvesoftware.com/wiki/Steam_Web_API/IEconService#CEcon_TradeOffer
 	public sealed class TradeOffer {
 		[PublicAPI]

ArchiSteamFarm/Steam/Data/TradeOfferAcceptResponse.cs

@@ -22,7 +22,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm.Json {
+namespace ArchiSteamFarm.Steam.Data {
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
 	internal sealed class TradeOfferAcceptResponse {
 		[JsonProperty(PropertyName = "strError", Required = Required.DisallowNull)]

ArchiSteamFarm/Steam/Data/TradeOfferSendRequest.cs

@@ -22,7 +22,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm.Json {
+namespace ArchiSteamFarm.Steam.Data {
 	internal sealed class TradeOfferSendRequest {
 		[JsonProperty(PropertyName = "me", Required = Required.Always)]
 		internal readonly ItemList ItemsToGive = new();

ArchiSteamFarm/Steam/Data/TradeOfferSendResponse.cs

@@ -20,9 +20,10 @@
 // limitations under the License.
 
 using System.Diagnostics.CodeAnalysis;
+using ArchiSteamFarm.Core;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm.Json {
+namespace ArchiSteamFarm.Steam.Data {
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
 	internal sealed class TradeOfferSendResponse {
 		[JsonProperty(PropertyName = "strError", Required = Required.DisallowNull)]

ArchiSteamFarm/Steam/Data/UserPrivacy.cs

@@ -22,9 +22,10 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
+using ArchiSteamFarm.Steam.Integration;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm.Json {
+namespace ArchiSteamFarm.Steam.Data {
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
 	internal sealed class UserPrivacy {
 		[JsonProperty(PropertyName = "eCommentPermission", Required = Required.Always)]

ArchiSteamFarm/Steam/Exchange/ParseTradeResult.cs

@@ -24,10 +24,10 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.ComponentModel;
 using System.Linq;
-using ArchiSteamFarm.Json;
+using ArchiSteamFarm.Steam.Data;
 using JetBrains.Annotations;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Exchange {
 	public sealed class ParseTradeResult {
 		[PublicAPI]
 		public EResult Result { get; }

ArchiSteamFarm/Steam/Exchange/Trading.cs

@@ -30,13 +30,17 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using ArchiSteamFarm.Collections;
-using ArchiSteamFarm.Json;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.Plugins;
+using ArchiSteamFarm.Steam.Data;
+using ArchiSteamFarm.Steam.Idling;
+using ArchiSteamFarm.Steam.Security;
+using ArchiSteamFarm.Steam.Storage;
 using JetBrains.Annotations;
 using SteamKit2;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Exchange {
 	public sealed class Trading : IDisposable {
 		internal const byte MaxItemsPerTrade = byte.MaxValue; // This is decided upon various factors, mainly stability of Steam servers when dealing with huge trade offers
 		internal const byte MaxTradesPerAccount = 5; // This is limit introduced by Valve

ArchiSteamFarm/Steam/Idling/CardsFarmer.cs

@@ -34,13 +34,17 @@ using System.Threading;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
 using ArchiSteamFarm.Collections;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.Plugins;
+using ArchiSteamFarm.Steam.Integration;
+using ArchiSteamFarm.Steam.Storage;
+using ArchiSteamFarm.Storage;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using SteamKit2;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Idling {
 	public sealed class CardsFarmer : IAsyncDisposable {
 		internal const byte DaysForRefund = 14; // In how many days since payment we're allowed to refund
 		internal const byte HoursForRefund = 2; // Up to how many hours we're allowed to play for refund

ArchiSteamFarm/Steam/Idling/Game.cs

@@ -25,7 +25,7 @@ using HashCode = ArchiSteamFarm.RuntimeCompatibility.HashCode;
 using System;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Idling {
 	public sealed class Game : IEquatable<Game> {
 		[JsonProperty]
 		public uint AppID { get; }

ArchiSteamFarm/Steam/Integration/ArchiHandler.cs

@@ -24,14 +24,15 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
-using ArchiSteamFarm.Callbacks;
+using ArchiSteamFarm.Core;
-using ArchiSteamFarm.CMsgs;
 using ArchiSteamFarm.NLog;
+using ArchiSteamFarm.Steam.Integration.Callbacks;
+using ArchiSteamFarm.Steam.Integration.CMsgs;
 using JetBrains.Annotations;
 using SteamKit2;
 using SteamKit2.Internal;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Integration {
 	public sealed class ArchiHandler : ClientMsgHandler {
 		internal const byte MaxGamesPlayedConcurrently = 32; // This is limit introduced by Steam Network
 

ArchiSteamFarm/Steam/Integration/ArchiWebHandler.cs

@@ -36,9 +36,14 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
 using AngleSharp.Dom;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Helpers;
-using ArchiSteamFarm.Json;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Steam.Data;
+using ArchiSteamFarm.Steam.Exchange;
+using ArchiSteamFarm.Steam.Security;
+using ArchiSteamFarm.Steam.Storage;
+using ArchiSteamFarm.Storage;
 using ArchiSteamFarm.Web;
 using ArchiSteamFarm.Web.Responses;
 using JetBrains.Annotations;
@@ -47,7 +52,7 @@ using Newtonsoft.Json.Linq;
 using SteamKit2;
 using Formatting = Newtonsoft.Json.Formatting;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Integration {
 	public sealed class ArchiWebHandler : IDisposable {
 		internal const ushort MaxItemsInSingleInventoryRequest = 5000;
 

ArchiSteamFarm/Steam/Integration/CMsgs/CMsgClientAcknowledgeClanInvite.cs

@@ -25,7 +25,7 @@ using System.Text;
 using SteamKit2;
 using SteamKit2.Internal;
 
-namespace ArchiSteamFarm.CMsgs {
+namespace ArchiSteamFarm.Steam.Integration.CMsgs {
 	internal sealed class CMsgClientAcknowledgeClanInvite : ISteamSerializableMessage {
 		internal bool AcceptInvite { private get; set; }
 		internal ulong ClanID { private get; set; }

ArchiSteamFarm/Steam/Integration/Callbacks/PurchaseResponseCallback.cs

@@ -24,11 +24,12 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Net;
+using ArchiSteamFarm.Core;
 using JetBrains.Annotations;
 using SteamKit2;
 using SteamKit2.Internal;
 
-namespace ArchiSteamFarm.Callbacks {
+namespace ArchiSteamFarm.Steam.Integration.Callbacks {
 	public sealed class PurchaseResponseCallback : CallbackMsg {
 		[PublicAPI]
 		public Dictionary<uint, string>? Items { get; }

ArchiSteamFarm/Steam/Integration/Callbacks/UserNotificationsCallback.cs

@@ -22,12 +22,13 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Localization;
 using JetBrains.Annotations;
 using SteamKit2;
 using SteamKit2.Internal;
 
-namespace ArchiSteamFarm.Callbacks {
+namespace ArchiSteamFarm.Steam.Integration.Callbacks {
 	public sealed class UserNotificationsCallback : CallbackMsg {
 		internal readonly Dictionary<EUserNotification, uint> Notifications;
 

ArchiSteamFarm/Steam/Integration/SteamPICSChanges.cs

@@ -22,12 +22,13 @@
 using System;
 using System.Linq;
 using System.Threading;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.Plugins;
 using ArchiSteamFarm.Web;
 using SteamKit2;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Integration {
 	internal static class SteamPICSChanges {
 		private const byte RefreshTimerInMinutes = 5;
 

ArchiSteamFarm/Steam/Integration/SteamSaleEvent.cs

@@ -28,9 +28,10 @@ using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Localization;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Integration {
 	internal sealed class SteamSaleEvent : IAsyncDisposable {
 		private const byte MaxSingleQueuesDaily = 3; // This is only a failsafe for infinite queue clearing (in case IsDiscoveryQueueAvailable() would fail us)
 

ArchiSteamFarm/Steam/Interaction/Actions.cs

@@ -30,16 +30,22 @@ using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using ArchiSteamFarm.Callbacks;
 using ArchiSteamFarm.Collections;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Helpers;
-using ArchiSteamFarm.Json;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Steam.Data;
+using ArchiSteamFarm.Steam.Exchange;
+using ArchiSteamFarm.Steam.Integration;
+using ArchiSteamFarm.Steam.Integration.Callbacks;
+using ArchiSteamFarm.Steam.Security;
+using ArchiSteamFarm.Steam.Storage;
+using ArchiSteamFarm.Storage;
 using ArchiSteamFarm.Web;
 using JetBrains.Annotations;
 using SteamKit2;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Interaction {
 	public sealed class Actions : IAsyncDisposable {
 		private static readonly SemaphoreSlim GiftCardsSemaphore = new(1, 1);
 

ArchiSteamFarm/Steam/Interaction/Commands.cs

@@ -27,15 +27,21 @@ using System.Net.Http;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using ArchiSteamFarm.Callbacks;
+using ArchiSteamFarm.Core;
-using ArchiSteamFarm.Json;
+using ArchiSteamFarm.Helpers;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.Plugins;
 using ArchiSteamFarm.RuntimeCompatibility;
+using ArchiSteamFarm.Steam.Data;
+using ArchiSteamFarm.Steam.Idling;
+using ArchiSteamFarm.Steam.Integration;
+using ArchiSteamFarm.Steam.Integration.Callbacks;
+using ArchiSteamFarm.Steam.Storage;
+using ArchiSteamFarm.Storage;
 using JetBrains.Annotations;
 using SteamKit2;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Interaction {
 	public sealed class Commands {
 		private const ushort SteamTypingStatusDelay = 10 * 1000; // Steam client broadcasts typing status each 10 seconds
 

ArchiSteamFarm/Steam/Security/Confirmation.cs

@@ -24,7 +24,7 @@ using System.ComponentModel;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Security {
 	public sealed class Confirmation {
 		[JsonProperty(Required = Required.Always)]
 		public ulong Creator { get; }

ArchiSteamFarm/Steam/Security/MobileAuthenticator.cs

@@ -29,11 +29,13 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Helpers;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Storage;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Security {
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
 	public sealed class MobileAuthenticator : IDisposable {
 		internal const byte BackupCodeDigits = 7;

ArchiSteamFarm/Steam/SteamKit2/InMemoryServerListProvider.cs

@@ -27,7 +27,7 @@ using ArchiSteamFarm.Collections;
 using Newtonsoft.Json;
 using SteamKit2.Discovery;
 
-namespace ArchiSteamFarm.SteamKit2 {
+namespace ArchiSteamFarm.Steam.SteamKit2 {
 	internal sealed class InMemoryServerListProvider : IServerListProvider {
 		[JsonProperty(Required = Required.DisallowNull)]
 		private readonly ConcurrentHashSet<ServerRecordEndPoint> ServerRecords = new();

ArchiSteamFarm/Steam/SteamKit2/ServerRecordEndPoint.cs

@@ -27,7 +27,7 @@ using System.ComponentModel;
 using Newtonsoft.Json;
 using SteamKit2;
 
-namespace ArchiSteamFarm.SteamKit2 {
+namespace ArchiSteamFarm.Steam.SteamKit2 {
 	internal sealed class ServerRecordEndPoint : IEquatable<ServerRecordEndPoint> {
 		[JsonProperty(Required = Required.Always)]
 		internal readonly string Host = "";

ArchiSteamFarm/Steam/Storage/BotConfig.cs

@@ -27,15 +27,18 @@ using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using ArchiSteamFarm.Json;
+using ArchiSteamFarm.Core;
+using ArchiSteamFarm.Helpers;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.RuntimeCompatibility;
+using ArchiSteamFarm.Steam.Data;
+using ArchiSteamFarm.Steam.Integration;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SteamKit2;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Storage {
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
 	public sealed class BotConfig {
 		[PublicAPI]

ArchiSteamFarm/Steam/Storage/BotDatabase.cs

@@ -27,11 +27,13 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using ArchiSteamFarm.Collections;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Helpers;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Steam.Security;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Steam.Storage {
 	internal sealed class BotDatabase : SerializableFile {
 		[JsonProperty(Required = Required.DisallowNull)]
 		internal readonly ConcurrentHashSet<ulong> BlacklistedFromTradesSteamIDs = new();

ArchiSteamFarm/Storage/GlobalConfig.cs

@@ -28,13 +28,16 @@ using System.IO;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
+using ArchiSteamFarm.Helpers;
 using ArchiSteamFarm.Localization;
+using ArchiSteamFarm.Steam;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SteamKit2;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Storage {
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
 	public sealed class GlobalConfig {
 		[PublicAPI]

ArchiSteamFarm/Storage/GlobalDatabase.cs

@@ -33,13 +33,15 @@ using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Helpers;
 using ArchiSteamFarm.Localization;
-using ArchiSteamFarm.SteamKit2;
+using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Steam.SteamKit2;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 
-namespace ArchiSteamFarm {
+namespace ArchiSteamFarm.Storage {
 	public sealed class GlobalDatabase : SerializableFile {
 		[JsonIgnore]
 		[PublicAPI]

ArchiSteamFarm/Web/GitHub.cs

@@ -29,6 +29,7 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Web.Responses;
 using Markdig;
 using Markdig.Renderers;

ArchiSteamFarm/Web/Responses/HtmlDocumentResponse.cs

@@ -23,6 +23,7 @@ using System;
 using System.Threading.Tasks;
 using AngleSharp;
 using AngleSharp.Dom;
+using ArchiSteamFarm.Core;
 using JetBrains.Annotations;
 
 namespace ArchiSteamFarm.Web.Responses {

ArchiSteamFarm/Web/WebBrowser.cs

@@ -29,6 +29,7 @@ using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
+using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Localization;
 using ArchiSteamFarm.NLog;
 using ArchiSteamFarm.RuntimeCompatibility;