diff --git a/DiscordChatExporter.Cli.Tests/Specs/CsvWriting/ContentSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Csv/ContentSpecs.cs
similarity index 93%
rename from DiscordChatExporter.Cli.Tests/Specs/CsvWriting/ContentSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Csv/ContentSpecs.cs
index dab3b702..d74f65fe 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/CsvWriting/ContentSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Csv/ContentSpecs.cs
@@ -4,7 +4,7 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.CsvWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Csv;
 
 public class ContentSpecs : IClassFixture<ExportWrapperFixture>
 {
diff --git a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/AttachmentSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Html/AttachmentSpecs.cs
similarity index 98%
rename from DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/AttachmentSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Html/AttachmentSpecs.cs
index 9bc52fef..d4c215af 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/AttachmentSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Html/AttachmentSpecs.cs
@@ -7,7 +7,7 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Html;
 
 public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
 {
diff --git a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/ContentSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Html/ContentSpecs.cs
similarity index 95%
rename from DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/ContentSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Html/ContentSpecs.cs
index 803dd8f8..71951213 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/ContentSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Html/ContentSpecs.cs
@@ -6,7 +6,7 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Html;
 
 public class ContentSpecs : IClassFixture<ExportWrapperFixture>
 {
diff --git a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/EmbedSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Html/EmbedSpecs.cs
similarity index 98%
rename from DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/EmbedSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Html/EmbedSpecs.cs
index 2312043d..4602cb16 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/EmbedSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Html/EmbedSpecs.cs
@@ -7,7 +7,7 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Html;
 
 public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
 {
diff --git a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/GroupingSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Html/GroupingSpecs.cs
similarity index 93%
rename from DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/GroupingSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Html/GroupingSpecs.cs
index e021e740..89dba0e0 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/GroupingSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Html/GroupingSpecs.cs
@@ -7,12 +7,11 @@ using DiscordChatExporter.Cli.Commands;
 using DiscordChatExporter.Cli.Tests.Fixtures;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Cli.Tests.TestData;
-using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Html;
 
 public class GroupingSpecs : IClassFixture<TempOutputFixture>
 {
@@ -41,7 +40,7 @@ public class GroupingSpecs : IClassFixture<TempOutputFixture>
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
-        var messageGroups = Html
+        var messageGroups = Utils.Html
             .Parse(await File.ReadAllTextAsync(filePath))
             .QuerySelectorAll(".chatlog__message-group");
 
diff --git a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/MentionSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Html/MentionSpecs.cs
similarity index 97%
rename from DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/MentionSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Html/MentionSpecs.cs
index a89882de..61cc8928 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/MentionSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Html/MentionSpecs.cs
@@ -6,7 +6,7 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Html;
 
 public class MentionSpecs : IClassFixture<ExportWrapperFixture>
 {
diff --git a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/ReplySpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Html/ReplySpecs.cs
similarity index 97%
rename from DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/ReplySpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Html/ReplySpecs.cs
index 3a38e04d..3a183e8f 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/ReplySpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Html/ReplySpecs.cs
@@ -6,7 +6,7 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Html;
 
 public class ReplySpecs : IClassFixture<ExportWrapperFixture>
 {
diff --git a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/StickerSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Html/StickerSpecs.cs
similarity index 95%
rename from DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/StickerSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Html/StickerSpecs.cs
index a950a873..48bce7da 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/StickerSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Html/StickerSpecs.cs
@@ -5,7 +5,7 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Html;
 
 public class StickerSpecs : IClassFixture<ExportWrapperFixture>
 {
diff --git a/DiscordChatExporter.Cli.Tests/Specs/JsonWriting/AttachmentSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Json/AttachmentSpecs.cs
similarity index 98%
rename from DiscordChatExporter.Cli.Tests/Specs/JsonWriting/AttachmentSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Json/AttachmentSpecs.cs
index a0d0c9a8..283c2753 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/JsonWriting/AttachmentSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Json/AttachmentSpecs.cs
@@ -6,7 +6,7 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Json;
 
 public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
 {
diff --git a/DiscordChatExporter.Cli.Tests/Specs/JsonWriting/ContentSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Json/ContentSpecs.cs
similarity index 95%
rename from DiscordChatExporter.Cli.Tests/Specs/JsonWriting/ContentSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Json/ContentSpecs.cs
index 93189946..0db09ab2 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/JsonWriting/ContentSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Json/ContentSpecs.cs
@@ -5,7 +5,7 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Json;
 
 public class ContentSpecs : IClassFixture<ExportWrapperFixture>
 {
diff --git a/DiscordChatExporter.Cli.Tests/Specs/JsonWriting/EmbedSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Json/EmbedSpecs.cs
similarity index 97%
rename from DiscordChatExporter.Cli.Tests/Specs/JsonWriting/EmbedSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Json/EmbedSpecs.cs
index 1d1726d4..325e0112 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/JsonWriting/EmbedSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Json/EmbedSpecs.cs
@@ -6,7 +6,7 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Json;
 
 public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
 {
diff --git a/DiscordChatExporter.Cli.Tests/Specs/JsonWriting/MentionSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Json/MentionSpecs.cs
similarity index 97%
rename from DiscordChatExporter.Cli.Tests/Specs/JsonWriting/MentionSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Json/MentionSpecs.cs
index bb01062a..bb5adf3f 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/JsonWriting/MentionSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Json/MentionSpecs.cs
@@ -6,7 +6,7 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Json;
 
 public class MentionSpecs : IClassFixture<ExportWrapperFixture>
 {
diff --git a/DiscordChatExporter.Cli.Tests/Specs/JsonWriting/StickerSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/Json/StickerSpecs.cs
similarity index 97%
rename from DiscordChatExporter.Cli.Tests/Specs/JsonWriting/StickerSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/Json/StickerSpecs.cs
index 41844e96..5612e9aa 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/JsonWriting/StickerSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/Json/StickerSpecs.cs
@@ -6,7 +6,7 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.Json;
 
 public class StickerSpecs : IClassFixture<ExportWrapperFixture>
 {
diff --git a/DiscordChatExporter.Cli.Tests/Specs/PlainTextWriting/ContentSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/PlainText/ContentSpecs.cs
similarity index 93%
rename from DiscordChatExporter.Cli.Tests/Specs/PlainTextWriting/ContentSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/PlainText/ContentSpecs.cs
index 3be01a8c..db798165 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/PlainTextWriting/ContentSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/PlainText/ContentSpecs.cs
@@ -4,7 +4,7 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.PlainTextWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs.PlainText;
 
 public class ContentSpecs : IClassFixture<ExportWrapperFixture>
 {