diff --git a/DiscordChatExporter.Cli.Tests/Specs/Csv/ContentSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/CsvContentSpecs.cs
similarity index 80%
rename from DiscordChatExporter.Cli.Tests/Specs/Csv/ContentSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/CsvContentSpecs.cs
index d74f65f..a7bfba4 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Csv/ContentSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/CsvContentSpecs.cs
@@ -4,13 +4,13 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Csv;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class ContentSpecs : IClassFixture<ExportWrapperFixture>
+public class CsvContentSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public ContentSpecs(ExportWrapperFixture exportWrapper)
+    public CsvContentSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/Html/AttachmentSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/HtmlAttachmentSpecs.cs
similarity index 94%
rename from DiscordChatExporter.Cli.Tests/Specs/Html/AttachmentSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/HtmlAttachmentSpecs.cs
index d4c215a..b6b00ba 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Html/AttachmentSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/HtmlAttachmentSpecs.cs
@@ -7,13 +7,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlAttachmentSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public AttachmentSpecs(ExportWrapperFixture exportWrapper)
+    public HtmlAttachmentSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/Html/ContentSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/HtmlContentSpecs.cs
similarity index 86%
rename from DiscordChatExporter.Cli.Tests/Specs/Html/ContentSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/HtmlContentSpecs.cs
index 7195121..b0070fb 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Html/ContentSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/HtmlContentSpecs.cs
@@ -6,13 +6,13 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class ContentSpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlContentSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public ContentSpecs(ExportWrapperFixture exportWrapper)
+    public HtmlContentSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/Html/EmbedSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/HtmlEmbedSpecs.cs
similarity index 96%
rename from DiscordChatExporter.Cli.Tests/Specs/Html/EmbedSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/HtmlEmbedSpecs.cs
index 4602cb1..e115d97 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Html/EmbedSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/HtmlEmbedSpecs.cs
@@ -7,13 +7,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlEmbedSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public EmbedSpecs(ExportWrapperFixture exportWrapper)
+    public HtmlEmbedSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/Html/GroupingSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/HtmlGroupingSpecs.cs
similarity index 91%
rename from DiscordChatExporter.Cli.Tests/Specs/Html/GroupingSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/HtmlGroupingSpecs.cs
index 89dba0e..7db2000 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Html/GroupingSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/HtmlGroupingSpecs.cs
@@ -11,13 +11,13 @@ using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class GroupingSpecs : IClassFixture<TempOutputFixture>
+public class HtmlGroupingSpecs : IClassFixture<TempOutputFixture>
 {
     private readonly TempOutputFixture _tempOutput;
 
-    public GroupingSpecs(TempOutputFixture tempOutput)
+    public HtmlGroupingSpecs(TempOutputFixture tempOutput)
     {
         _tempOutput = tempOutput;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/Html/MentionSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/HtmlMentionSpecs.cs
similarity index 91%
rename from DiscordChatExporter.Cli.Tests/Specs/Html/MentionSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/HtmlMentionSpecs.cs
index 61cc892..c16f0bf 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Html/MentionSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/HtmlMentionSpecs.cs
@@ -6,13 +6,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class MentionSpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlMentionSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public MentionSpecs(ExportWrapperFixture exportWrapper)
+    public HtmlMentionSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/Html/ReplySpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/HtmlReplySpecs.cs
similarity index 91%
rename from DiscordChatExporter.Cli.Tests/Specs/Html/ReplySpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/HtmlReplySpecs.cs
index 3a183e8..effd9d9 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Html/ReplySpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/HtmlReplySpecs.cs
@@ -6,13 +6,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class ReplySpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlReplySpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public ReplySpecs(ExportWrapperFixture exportWrapper)
+    public HtmlReplySpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/Html/StickerSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/HtmlStickerSpecs.cs
similarity index 87%
rename from DiscordChatExporter.Cli.Tests/Specs/Html/StickerSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/HtmlStickerSpecs.cs
index 48bce7d..3a93d03 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Html/StickerSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/HtmlStickerSpecs.cs
@@ -5,13 +5,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class StickerSpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlStickerSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public StickerSpecs(ExportWrapperFixture exportWrapper)
+    public HtmlStickerSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/Json/AttachmentSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/JsonAttachmentSpecs.cs
similarity index 95%
rename from DiscordChatExporter.Cli.Tests/Specs/Json/AttachmentSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/JsonAttachmentSpecs.cs
index 283c275..4ed849a 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Json/AttachmentSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/JsonAttachmentSpecs.cs
@@ -6,13 +6,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Json;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
+public class JsonAttachmentSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public AttachmentSpecs(ExportWrapperFixture exportWrapper)
+    public JsonAttachmentSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/Json/ContentSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/JsonContentSpecs.cs
similarity index 86%
rename from DiscordChatExporter.Cli.Tests/Specs/Json/ContentSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/JsonContentSpecs.cs
index 0db09ab..42d981a 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Json/ContentSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/JsonContentSpecs.cs
@@ -5,13 +5,13 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Json;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class ContentSpecs : IClassFixture<ExportWrapperFixture>
+public class JsonContentSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public ContentSpecs(ExportWrapperFixture exportWrapper)
+    public JsonContentSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/Json/EmbedSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/JsonEmbedSpecs.cs
similarity index 94%
rename from DiscordChatExporter.Cli.Tests/Specs/Json/EmbedSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/JsonEmbedSpecs.cs
index 325e011..41a2b35 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Json/EmbedSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/JsonEmbedSpecs.cs
@@ -6,13 +6,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Json;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
+public class JsonEmbedSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public EmbedSpecs(ExportWrapperFixture exportWrapper)
+    public JsonEmbedSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/Json/MentionSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/JsonMentionSpecs.cs
similarity index 92%
rename from DiscordChatExporter.Cli.Tests/Specs/Json/MentionSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/JsonMentionSpecs.cs
index bb5adf3..fd0c54d 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Json/MentionSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/JsonMentionSpecs.cs
@@ -6,13 +6,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Json;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class MentionSpecs : IClassFixture<ExportWrapperFixture>
+public class JsonMentionSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public MentionSpecs(ExportWrapperFixture exportWrapper)
+    public JsonMentionSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/Json/StickerSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/JsonStickerSpecs.cs
similarity index 91%
rename from DiscordChatExporter.Cli.Tests/Specs/Json/StickerSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/JsonStickerSpecs.cs
index 5612e9a..ce2fc4a 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/Json/StickerSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/JsonStickerSpecs.cs
@@ -6,13 +6,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Json;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class StickerSpecs : IClassFixture<ExportWrapperFixture>
+public class JsonStickerSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public StickerSpecs(ExportWrapperFixture exportWrapper)
+    public JsonStickerSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Cli.Tests/Specs/PlainText/ContentSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/PlainTextContentSpecs.cs
similarity index 79%
rename from DiscordChatExporter.Cli.Tests/Specs/PlainText/ContentSpecs.cs
rename to DiscordChatExporter.Cli.Tests/Specs/PlainTextContentSpecs.cs
index db79816..f64071d 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/PlainText/ContentSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/PlainTextContentSpecs.cs
@@ -4,13 +4,13 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.PlainText;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class ContentSpecs : IClassFixture<ExportWrapperFixture>
+public class PlainTextContentSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public ContentSpecs(ExportWrapperFixture exportWrapper)
+    public PlainTextContentSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }
diff --git a/DiscordChatExporter.Core/Discord/Data/Message.cs b/DiscordChatExporter.Core/Discord/Data/Message.cs
index cdda0ab..e0fee0a 100644
--- a/DiscordChatExporter.Core/Discord/Data/Message.cs
+++ b/DiscordChatExporter.Core/Discord/Data/Message.cs
@@ -32,7 +32,7 @@ public record Message(
         if (embeds.Count <= 1)
             return embeds;
 
-        // Discord API doesn't support embeds with multiple images, even though the Discord client does.
+        // Discord API doesn't support embeds with multiple images, even though Discord client does.
         // To work around this, it seems that the API returns multiple consecutive embeds with different images,
         // which are then merged together on the client. We need to replicate the same behavior ourselves.
         // Currently, only known case where this workaround is required is Twitter embeds.
diff --git a/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj b/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
index ada6941..be0499d 100644
--- a/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
+++ b/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <RazorBlade Include="Exporting\Html\*.cshtml" />
+    <RazorBlade Include="**\*.cshtml" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/DiscordChatExporter.Core/Exporting/Csv/CsvMessageWriter.cs b/DiscordChatExporter.Core/Exporting/CsvMessageWriter.cs
similarity index 97%
rename from DiscordChatExporter.Core/Exporting/Csv/CsvMessageWriter.cs
rename to DiscordChatExporter.Core/Exporting/CsvMessageWriter.cs
index 96865e7..29e1f83 100644
--- a/DiscordChatExporter.Core/Exporting/Csv/CsvMessageWriter.cs
+++ b/DiscordChatExporter.Core/Exporting/CsvMessageWriter.cs
@@ -4,10 +4,9 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
-using DiscordChatExporter.Core.Exporting.PlainText;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting.Csv;
+namespace DiscordChatExporter.Core.Exporting;
 
 internal partial class CsvMessageWriter : MessageWriter
 {
diff --git a/DiscordChatExporter.Core/Exporting/Html/HtmlMarkdownVisitor.cs b/DiscordChatExporter.Core/Exporting/HtmlMarkdownVisitor.cs
similarity index 99%
rename from DiscordChatExporter.Core/Exporting/Html/HtmlMarkdownVisitor.cs
rename to DiscordChatExporter.Core/Exporting/HtmlMarkdownVisitor.cs
index d90e759..ecd92a3 100644
--- a/DiscordChatExporter.Core/Exporting/Html/HtmlMarkdownVisitor.cs
+++ b/DiscordChatExporter.Core/Exporting/HtmlMarkdownVisitor.cs
@@ -10,7 +10,7 @@ using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Markdown.Parsing;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting.Html;
+namespace DiscordChatExporter.Core.Exporting;
 
 internal partial class HtmlMarkdownVisitor : MarkdownVisitor
 {
diff --git a/DiscordChatExporter.Core/Exporting/Html/MessageExtensions.cs b/DiscordChatExporter.Core/Exporting/HtmlMessageExtensions.cs
similarity index 86%
rename from DiscordChatExporter.Core/Exporting/Html/MessageExtensions.cs
rename to DiscordChatExporter.Core/Exporting/HtmlMessageExtensions.cs
index f970b79..c511432 100644
--- a/DiscordChatExporter.Core/Exporting/Html/MessageExtensions.cs
+++ b/DiscordChatExporter.Core/Exporting/HtmlMessageExtensions.cs
@@ -2,9 +2,9 @@ using System;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Discord.Data.Embeds;
 
-namespace DiscordChatExporter.Core.Exporting.Html;
+namespace DiscordChatExporter.Core.Exporting;
 
-internal static class MessageExtensions
+internal static class HtmlMessageExtensions
 {
     // Message content is hidden if it's a link to an embedded media
     // https://github.com/Tyrrrz/DiscordChatExporter/issues/682
diff --git a/DiscordChatExporter.Core/Exporting/Html/HtmlMessageWriter.cs b/DiscordChatExporter.Core/Exporting/HtmlMessageWriter.cs
similarity index 98%
rename from DiscordChatExporter.Core/Exporting/Html/HtmlMessageWriter.cs
rename to DiscordChatExporter.Core/Exporting/HtmlMessageWriter.cs
index c22975e..95354f8 100644
--- a/DiscordChatExporter.Core/Exporting/Html/HtmlMessageWriter.cs
+++ b/DiscordChatExporter.Core/Exporting/HtmlMessageWriter.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using WebMarkupMin.Core;
 
-namespace DiscordChatExporter.Core.Exporting.Html;
+namespace DiscordChatExporter.Core.Exporting;
 
 internal class HtmlMessageWriter : MessageWriter
 {
diff --git a/DiscordChatExporter.Core/Exporting/Json/JsonMessageWriter.cs b/DiscordChatExporter.Core/Exporting/JsonMessageWriter.cs
similarity index 99%
rename from DiscordChatExporter.Core/Exporting/Json/JsonMessageWriter.cs
rename to DiscordChatExporter.Core/Exporting/JsonMessageWriter.cs
index 0da6a38..1b32f91 100644
--- a/DiscordChatExporter.Core/Exporting/Json/JsonMessageWriter.cs
+++ b/DiscordChatExporter.Core/Exporting/JsonMessageWriter.cs
@@ -5,11 +5,10 @@ using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Discord.Data.Embeds;
-using DiscordChatExporter.Core.Exporting.PlainText;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Writing;
 
-namespace DiscordChatExporter.Core.Exporting.Json;
+namespace DiscordChatExporter.Core.Exporting;
 
 internal class JsonMessageWriter : MessageWriter
 {
diff --git a/DiscordChatExporter.Core/Exporting/MessageExporter.cs b/DiscordChatExporter.Core/Exporting/MessageExporter.cs
index a975d48..70b7087 100644
--- a/DiscordChatExporter.Core/Exporting/MessageExporter.cs
+++ b/DiscordChatExporter.Core/Exporting/MessageExporter.cs
@@ -3,10 +3,6 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
-using DiscordChatExporter.Core.Exporting.Csv;
-using DiscordChatExporter.Core.Exporting.Html;
-using DiscordChatExporter.Core.Exporting.Json;
-using DiscordChatExporter.Core.Exporting.PlainText;
 
 namespace DiscordChatExporter.Core.Exporting;
 
diff --git a/DiscordChatExporter.Core/Exporting/Html/MessageGroupTemplate.cshtml b/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml
similarity index 100%
rename from DiscordChatExporter.Core/Exporting/Html/MessageGroupTemplate.cshtml
rename to DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml
diff --git a/DiscordChatExporter.Core/Exporting/PlainText/PlainTextMarkdownVisitor.cs b/DiscordChatExporter.Core/Exporting/PlainTextMarkdownVisitor.cs
similarity index 98%
rename from DiscordChatExporter.Core/Exporting/PlainText/PlainTextMarkdownVisitor.cs
rename to DiscordChatExporter.Core/Exporting/PlainTextMarkdownVisitor.cs
index 2e956b4..4543642 100644
--- a/DiscordChatExporter.Core/Exporting/PlainText/PlainTextMarkdownVisitor.cs
+++ b/DiscordChatExporter.Core/Exporting/PlainTextMarkdownVisitor.cs
@@ -5,7 +5,7 @@ using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Markdown.Parsing;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting.PlainText;
+namespace DiscordChatExporter.Core.Exporting;
 
 internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
 {
diff --git a/DiscordChatExporter.Core/Exporting/PlainText/PlainTextMessageWriter.cs b/DiscordChatExporter.Core/Exporting/PlainTextMessageWriter.cs
similarity index 99%
rename from DiscordChatExporter.Core/Exporting/PlainText/PlainTextMessageWriter.cs
rename to DiscordChatExporter.Core/Exporting/PlainTextMessageWriter.cs
index ec6247e..5d7cbf5 100644
--- a/DiscordChatExporter.Core/Exporting/PlainText/PlainTextMessageWriter.cs
+++ b/DiscordChatExporter.Core/Exporting/PlainTextMessageWriter.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Discord.Data.Embeds;
 
-namespace DiscordChatExporter.Core.Exporting.PlainText;
+namespace DiscordChatExporter.Core.Exporting;
 
 internal class PlainTextMessageWriter : MessageWriter
 {
diff --git a/DiscordChatExporter.Core/Exporting/Html/PostambleTemplate.cshtml b/DiscordChatExporter.Core/Exporting/PostambleTemplate.cshtml
similarity index 100%
rename from DiscordChatExporter.Core/Exporting/Html/PostambleTemplate.cshtml
rename to DiscordChatExporter.Core/Exporting/PostambleTemplate.cshtml
diff --git a/DiscordChatExporter.Core/Exporting/Html/PreambleTemplate.cshtml b/DiscordChatExporter.Core/Exporting/PreambleTemplate.cshtml
similarity index 100%
rename from DiscordChatExporter.Core/Exporting/Html/PreambleTemplate.cshtml
rename to DiscordChatExporter.Core/Exporting/PreambleTemplate.cshtml