From 75ac8eec28295cab0097ce1f73d3a6ee374ba804 Mon Sep 17 00:00:00 2001
From: Bruno Massa <brmassa@gmail.com>
Date: Thu, 25 Apr 2024 19:12:04 -0500
Subject: [PATCH 1/8] refactor: major renaming of private fields

---
 .editorconfig                                 |   4 -
 source/Commands/BaseGeneratorCommand.cs       |  20 +--
 source/Commands/BuildCommand.cs               |  44 ++---
 source/Commands/CheckLinkCommand.cs           |  54 +++---
 source/Commands/NewSiteCommand.cs             |  10 +-
 source/Commands/NewThemeCommand.cs            |   2 +-
 source/Commands/ServeCommand.cs               | 122 +++++++-------
 source/Helpers/FileUtils.cs                   |   2 +-
 source/Helpers/IFileWatcher.cs                |   6 +-
 source/Helpers/SiteCacheManager.cs            |  12 +-
 source/Helpers/SourceFileWatcher.cs           |  22 +--
 source/Helpers/StopwatchReporter.cs           |  28 ++--
 source/Models/Bundle.cs                       |   6 +-
 .../CommandLineOptions/CheckLinkOptions.cs    |   2 +-
 .../CommandLineOptions/NewSiteOptions.cs      |   2 +-
 source/Models/FrontMatter.cs                  |   4 +-
 source/Models/IFrontMatter.cs                 |   4 +-
 source/Models/IPage.cs                        |  12 +-
 source/Models/ISiteSettings.cs                |   4 +-
 source/Models/Kind.cs                         |   6 +-
 source/Models/Page.cs                         | 136 +++++++--------
 source/Models/Site.cs                         |  86 +++++-----
 source/Models/SiteSettings.cs                 |   4 +-
 source/Parsers/StaticContext.cs               |   2 +-
 source/Parsers/YAMLParser.cs                  |  10 +-
 source/Program.cs                             |   4 +-
 .../HttpListenerResponseWrapper.cs            |  12 +-
 .../ServerHandlers/RegisteredPageRequest.cs   |   8 +-
 .../RegisteredPageResourceRequest.cs          |   8 +-
 source/ServerHandlers/StaticFileRequest.cs    |  16 +-
 test/Commands/BaseGeneratorCommandTests.cs    |  12 +-
 test/Commands/BuildCommandTests.cs            |  34 ++--
 test/Commands/NewSiteCommandTests.cs          |  78 ++++-----
 test/Helpers/StopwatchReporterTests.cs        |  16 +-
 test/Models/FrontMatterTests.cs               |  10 +-
 test/Models/PageTests.cs                      | 106 ++++++------
 test/Models/SiteTests.cs                      | 156 +++++++++---------
 test/Parser/YAMLParserTests.cs                |  80 ++++-----
 .../ServerHandlers/PingRequestHandlerTests.cs |   4 +-
 .../RegisteredPageRequestHandlerTests.cs      |  28 ++--
 .../StaticFileRequestHandlerTests.cs          |  18 +-
 test/TestSetup.cs                             |  56 +++----
 42 files changed, 623 insertions(+), 627 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 080a294..e77d93c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -22,10 +22,6 @@ csharp_style_namespace_declarations = file_scoped:warning
 dotnet_diagnostic.IDE0090.severity = warning # Use 'new(...)' instead of 'new ...'
 dotnet_diagnostic.IDE1006.severity = warning
 
-dotnet_naming_rule.instance_fields_should_be_camel_case.severity = error
-dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
-dotnet_naming_rule.instance_fields_should_be_camel_case.style = camel_case_style
-
 dotnet_naming_symbols.instance_fields.applicable_kinds = field
 dotnet_naming_symbols.instance_fields.applicable_accessibilities = private
 
diff --git a/source/Commands/BaseGeneratorCommand.cs b/source/Commands/BaseGeneratorCommand.cs
index 0c4a8e8..93ae90a 100644
--- a/source/Commands/BaseGeneratorCommand.cs
+++ b/source/Commands/BaseGeneratorCommand.cs
@@ -14,32 +14,32 @@ public abstract class BaseGeneratorCommand
     /// <summary>
     /// The configuration file name.
     /// </summary>
-    protected const string configFile = "sucos.yaml";
+    protected const string ConfigFile = "sucos.yaml";
 
     /// <summary>
     /// The site configuration.
     /// </summary>
-    protected Site site { get; set; }
+    protected Site Site { get; set; }
 
     /// <summary>
     /// The front matter parser instance. The default is YAML.
     /// </summary>
-    protected IMetadataParser Parser { get; } = new YAMLParser();
+    protected IMetadataParser Parser { get; } = new YamlParser();
 
     /// <summary>
     /// The stopwatch reporter.
     /// </summary>
-    protected StopwatchReporter stopwatch { get; }
+    protected StopwatchReporter Stopwatch { get; }
 
     /// <summary>
     /// The logger (Serilog).
     /// </summary>
-    protected ILogger logger { get; }
+    protected ILogger Logger { get; }
 
     /// <summary>
     /// File system functions (file and directory)
     /// </summary>
-    protected readonly IFileSystem fs;
+    protected readonly IFileSystem Fs;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="BaseGeneratorCommand"/> class.
@@ -51,12 +51,12 @@ public abstract class BaseGeneratorCommand
     {
         ArgumentNullException.ThrowIfNull(options);
 
-        this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        stopwatch = new(logger);
-        this.fs = fs;
+        this.Logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        Stopwatch = new(logger);
+        this.Fs = fs;
 
         logger.Information("Source path: {source}", propertyValue: options.Source);
 
-        site = SiteHelper.Init(configFile, options, Parser, logger, stopwatch, fs);
+        Site = SiteHelper.Init(ConfigFile, options, Parser, logger, Stopwatch, fs);
     }
 }
diff --git a/source/Commands/BuildCommand.cs b/source/Commands/BuildCommand.cs
index 92983d6..11f0f04 100644
--- a/source/Commands/BuildCommand.cs
+++ b/source/Commands/BuildCommand.cs
@@ -9,7 +9,7 @@ namespace SuCoS;
 /// </summary>
 public class BuildCommand : BaseGeneratorCommand
 {
-    private readonly BuildOptions options;
+    private readonly BuildOptions _options;
     /// <summary>
     /// Entry point of the build command. It will be called by the main program
     /// in case the build command is invoked (which is by default).
@@ -20,7 +20,7 @@ public class BuildCommand : BaseGeneratorCommand
     public BuildCommand(BuildOptions options, ILogger logger, IFileSystem fs)
         : base(options, logger, fs)
     {
-        this.options = options ?? throw new ArgumentNullException(nameof(options));
+        this._options = options ?? throw new ArgumentNullException(nameof(options));
     }
 
     /// <summary>
@@ -28,70 +28,70 @@ public class BuildCommand : BaseGeneratorCommand
     /// </summary>
     public int Run()
     {
-        logger.Information("Output path: {output}", options.Output);
+        Logger.Information("Output path: {output}", _options.Output);
 
         // Generate the site pages
         CreateOutputFiles();
 
         // Copy theme static folder files into the root of the output folder
-        if (site.Theme is not null)
+        if (Site.Theme is not null)
         {
-            CopyFolder(site.Theme.StaticFolder, options.Output);
+            CopyFolder(Site.Theme.StaticFolder, _options.Output);
         }
 
         // Copy static folder files into the root of the output folder
-        CopyFolder(site.SourceStaticPath, options.Output);
+        CopyFolder(Site.SourceStaticPath, _options.Output);
 
         // Generate the build report
-        stopwatch.LogReport(site.Title);
+        Stopwatch.LogReport(Site.Title);
 
         return 0;
     }
 
     private void CreateOutputFiles()
     {
-        stopwatch.Start("Create");
+        Stopwatch.Start("Create");
 
         // Print each page
         var pagesCreated = 0; // counter to keep track of the number of pages created
-        _ = Parallel.ForEach(site.OutputReferences, pair =>
+        _ = Parallel.ForEach(Site.OutputReferences, pair =>
         {
             var (url, output) = pair;
 
             if (output is IPage page)
             {
-                var path = (url + (site.UglyURLs ? string.Empty : "/index.html")).TrimStart('/');
+                var path = (url + (Site.UglyUrLs ? string.Empty : "/index.html")).TrimStart('/');
 
                 // Generate the output path
-                var outputAbsolutePath = Path.Combine(options.Output, path);
+                var outputAbsolutePath = Path.Combine(_options.Output, path);
 
                 var outputDirectory = Path.GetDirectoryName(outputAbsolutePath);
-                fs.DirectoryCreateDirectory(outputDirectory!);
+                Fs.DirectoryCreateDirectory(outputDirectory!);
 
                 // Save the processed output to the final file
                 var result = page.CompleteContent;
-                fs.FileWriteAllText(outputAbsolutePath, result);
+                Fs.FileWriteAllText(outputAbsolutePath, result);
 
                 // Log
-                logger.Debug("Page created: {Permalink}", outputAbsolutePath);
+                Logger.Debug("Page created: {Permalink}", outputAbsolutePath);
 
                 // Use interlocked to safely increment the counter in a multi-threaded environment
                 _ = Interlocked.Increment(ref pagesCreated);
             }
             else if (output is IResource resource)
             {
-                var outputAbsolutePath = Path.Combine(options.Output, resource.Permalink!.TrimStart('/'));
+                var outputAbsolutePath = Path.Combine(_options.Output, resource.Permalink!.TrimStart('/'));
 
                 var outputDirectory = Path.GetDirectoryName(outputAbsolutePath);
-                fs.DirectoryCreateDirectory(outputDirectory!);
+                Fs.DirectoryCreateDirectory(outputDirectory!);
 
                 // Copy the file to the output folder
-                fs.FileCopy(resource.SourceFullPath, outputAbsolutePath, overwrite: true);
+                Fs.FileCopy(resource.SourceFullPath, outputAbsolutePath, overwrite: true);
             }
         });
 
         // Stop the stopwatch
-        stopwatch.Stop("Create", pagesCreated);
+        Stopwatch.Stop("Create", pagesCreated);
     }
 
     /// <summary>
@@ -102,16 +102,16 @@ public class BuildCommand : BaseGeneratorCommand
     public void CopyFolder(string source, string output)
     {
         // Check if the source folder even exists
-        if (!fs.DirectoryExists(source))
+        if (!Fs.DirectoryExists(source))
         {
             return;
         }
 
         // Create the output folder if it doesn't exist
-        fs.DirectoryCreateDirectory(output);
+        Fs.DirectoryCreateDirectory(output);
 
         // Get all files in the source folder
-        var files = fs.DirectoryGetFiles(source);
+        var files = Fs.DirectoryGetFiles(source);
 
         foreach (var fileFullPath in files)
         {
@@ -122,7 +122,7 @@ public class BuildCommand : BaseGeneratorCommand
             var destinationFullPath = Path.Combine(output, fileName);
 
             // Copy the file to the output folder
-            fs.FileCopy(fileFullPath, destinationFullPath, overwrite: true);
+            Fs.FileCopy(fileFullPath, destinationFullPath, overwrite: true);
         }
     }
 }
diff --git a/source/Commands/CheckLinkCommand.cs b/source/Commands/CheckLinkCommand.cs
index 2e99430..6440351 100644
--- a/source/Commands/CheckLinkCommand.cs
+++ b/source/Commands/CheckLinkCommand.cs
@@ -13,14 +13,14 @@ namespace SuCoS;
 public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger logger)
 {
     [GeneratedRegex(@"https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9@:%_\+.~#?&\/=]*)")]
-    private static partial Regex URLRegex();
-    private static readonly Regex urlRegex = URLRegex();
-    private const int retriesCount = 3;
-    private readonly TimeSpan retryInterval = TimeSpan.FromSeconds(1);
-    private HttpClient httpClient = null!;
-    private readonly ConcurrentBag<string> checkedLinks = [];
-    private readonly ConcurrentDictionary<string, List<string>> linkToFilesMap = [];
-    private readonly ConcurrentBag<string> failedLinks = [];
+    private static partial Regex UrlGeneratedRegex();
+    private static readonly Regex UrlRegex = UrlGeneratedRegex();
+    private const int RetriesCount = 3;
+    private readonly TimeSpan _retryInterval = TimeSpan.FromSeconds(1);
+    private HttpClient _httpClient = null!;
+    private readonly ConcurrentBag<string> _checkedLinks = [];
+    private readonly ConcurrentDictionary<string, List<string>> _linkToFilesMap = [];
+    private readonly ConcurrentBag<string> _failedLinks = [];
 
     /// <summary>
     /// Run the app
@@ -36,18 +36,18 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
             return 1;
         }
 
-        httpClient = GetHttpClient();
+        _httpClient = GetHttpClient();
 
         var files = GetFiles(directoryPath, settings.Filters);
-        var linksAreValid = await CheckLinks(directoryPath, files, httpClient).ConfigureAwait(false);
+        var linksAreValid = await CheckLinks(directoryPath, files, _httpClient).ConfigureAwait(false);
 
         if (!linksAreValid)
         {
             logger.Error("There are failed checks.");
 
-            foreach (var (link, linkfiles) in linkToFilesMap)
+            foreach (var (link, linkfiles) in _linkToFilesMap)
             {
-                if (failedLinks.Contains(link))
+                if (_failedLinks.Contains(link))
                 {
                     linkfiles.Sort();
                     logger.Error("Link {link} failed and are in these files:\n{files}", link, string.Join("\n", linkfiles));
@@ -76,7 +76,7 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
         {
             var fileNameSanitized = filePath[directoryPath.Length..].Trim('/', '\\');
             var fileText = File.ReadAllText(filePath);
-            var matches = urlRegex.Matches(fileText);
+            var matches = UrlRegex.Matches(fileText);
             if (matches.Count == 0)
             {
                 LogInformation("{fileName}: no links found", fileNameSanitized);
@@ -88,21 +88,21 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
             {
                 var link = match.Value.Trim('.');
 
-                if (!linkToFilesMap.TryGetValue(link, out var value))
+                if (!_linkToFilesMap.TryGetValue(link, out var value))
                 {
                     value = [];
-                    linkToFilesMap[link] = value;
+                    _linkToFilesMap[link] = value;
                 }
 
                 if (!value.Contains(fileNameSanitized))
                 {
                     value.Add(fileNameSanitized);
                 }
-                if (checkedLinks.Contains(link))
+                if (_checkedLinks.Contains(link))
                 {
                     continue;
                 }
-                checkedLinks.Add(link);
+                _checkedLinks.Add(link);
 
                 if (settings.Ignore.Contains(link))
                 {
@@ -117,13 +117,13 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
                 LogInformation("{fileName}: {link} found", fileNameSanitized, link);
 
                 var linkIsValid = false;
-                for (var j = 0; j < retriesCount && !linkIsValid; j++)
+                for (var j = 0; j < RetriesCount && !linkIsValid; j++)
                 {
                     linkIsValid |= await CheckLink(fileNameSanitized, link, httpClient).ConfigureAwait(false);
-                    if (!linkIsValid && j < retriesCount - 1)
+                    if (!linkIsValid && j < RetriesCount - 1)
                     {
                         LogInformation("{fileName}: {link} retrying...", fileNameSanitized, link);
-                        Thread.Sleep(retryInterval);
+                        Thread.Sleep(_retryInterval);
                     }
                 }
 
@@ -134,7 +134,7 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
                 else
                 {
                     LogError("{fileName}: {link} FAIL", fileNameSanitized, link);
-                    failedLinks.Add(link);
+                    _failedLinks.Add(link);
                 }
 
                 result &= linkIsValid;
@@ -146,13 +146,13 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
 
     private bool TryLocalFile(CheckLinkOptions settings, string directoryPath, string fileNameSanitized, string link)
     {
-        if (string.IsNullOrEmpty(settings.InternalURL) || !link.StartsWith(settings.InternalURL))
+        if (string.IsNullOrEmpty(settings.InternalUrl) || !link.StartsWith(settings.InternalUrl))
         {
             return false;
         }
 
         // Strip the InternalURL from the link
-        link = link[settings.InternalURL.Length..];
+        link = link[settings.InternalUrl.Length..];
 
         // Handle the link as a local file
         var localFilePath = Path.Combine(directoryPath, link);
@@ -163,9 +163,9 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
         else
         {
             LogError("{fileName}: {link} is a local file but does not exist", fileNameSanitized, link);
-            failedLinks.Add(link);
+            _failedLinks.Add(link);
         }
-        checkedLinks.Add(link);
+        _checkedLinks.Add(link);
 
         return true;
     }
@@ -185,7 +185,7 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
         catch (Exception ex)
         {
             LogError("{fileName}: {link} failed with: {exMessage}", fileName, link, ex.Message);
-            failedLinks.Add(link);
+            _failedLinks.Add(link);
             return false;
         }
     }
@@ -215,7 +215,7 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
             logger.Error(message, fileName, link, arg);
         }
     }
-    
+
     private void LogError(string message, string fileName, string? link, HttpStatusCode arg)
     {
         if (settings.Verbose)
diff --git a/source/Commands/NewSiteCommand.cs b/source/Commands/NewSiteCommand.cs
index 1f2c73a..90d3ef5 100644
--- a/source/Commands/NewSiteCommand.cs
+++ b/source/Commands/NewSiteCommand.cs
@@ -10,7 +10,7 @@ namespace SuCoS;
 /// </summary>
 public sealed partial class NewSiteCommand(NewSiteOptions options, ILogger logger, IFileSystem fileSystem, ISite site)
 {
-    private static SiteSettings siteSettings = null!;
+    private static SiteSettings _siteSettings = null!;
 
     /// <summary>
     /// Generate the needed data for the class
@@ -23,14 +23,14 @@ public sealed partial class NewSiteCommand(NewSiteOptions options, ILogger logge
     {
         ArgumentNullException.ThrowIfNull(options);
 
-        siteSettings = new SiteSettings()
+        _siteSettings = new SiteSettings()
         {
             Title = options.Title,
             Description = options.Description,
-            BaseURL = options.BaseURL
+            BaseUrl = options.BaseUrl
         };
 
-        var site = new Site(new GenerateOptions() { SourceOption = options.Output }, siteSettings, new YAMLParser(), null!, null);
+        var site = new Site(new GenerateOptions() { SourceOption = options.Output }, _siteSettings, new YamlParser(), null!, null);
         return new NewSiteCommand(options, logger, fileSystem, site);
     }
 
@@ -54,7 +54,7 @@ public sealed partial class NewSiteCommand(NewSiteOptions options, ILogger logge
         try
         {
             CreateFolders(site.SourceFolders);
-            site.Parser.Export(siteSettings, siteSettingsPath);
+            site.Parser.Export(_siteSettings, siteSettingsPath);
         }
         catch (Exception ex)
         {
diff --git a/source/Commands/NewThemeCommand.cs b/source/Commands/NewThemeCommand.cs
index d6b2bc6..89fca1a 100644
--- a/source/Commands/NewThemeCommand.cs
+++ b/source/Commands/NewThemeCommand.cs
@@ -36,7 +36,7 @@ public sealed partial class NewThemeCommand(NewThemeOptions options, ILogger log
 
         try
         {
-            new YAMLParser().Export(theme, themePath);
+            new YamlParser().Export(theme, themePath);
         }
         catch (Exception ex)
         {
diff --git a/source/Commands/ServeCommand.cs b/source/Commands/ServeCommand.cs
index 7c9c0ab..8d305a0 100644
--- a/source/Commands/ServeCommand.cs
+++ b/source/Commands/ServeCommand.cs
@@ -11,8 +11,8 @@ namespace SuCoS;
 /// </summary>
 public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
 {
-    private const string baseURLDefault = "http://localhost";
-    private const int portDefault = 1122;
+    private const string BaseUrlDefault = "http://localhost";
+    private const int PortDefault = 1122;
 
     /// <summary>
     /// The ServeOptions object containing the configuration parameters for the server.
@@ -20,7 +20,7 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
     /// verbosity of the logs, etc. These options are passed into the ServeCommand at construction 
     /// and are used throughout its operation.
     /// </summary>
-    private readonly ServeOptions options;
+    private readonly ServeOptions _options;
 
     /// <summary>
     /// The FileSystemWatcher object that monitors the source directory for file changes.
@@ -28,7 +28,7 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
     /// remains up-to-date. The FileSystemWatcher is configured with the source directory 
     /// at construction and starts watching immediately.
     /// </summary>
-    private readonly IFileWatcher fileWatcher;
+    private readonly IFileWatcher _fileWatcher;
 
     /// <summary>
     /// A Timer that helps to manage the frequency of server restarts.
@@ -36,7 +36,7 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
     /// when the timer expires, helping to ensure that rapid consecutive file changes result
     /// in a single server restart, not multiple.
     /// </summary>
-    private Timer? debounceTimer;
+    private Timer? _debounceTimer;
 
     /// <summary>
     /// A SemaphoreSlim used to ensure that server restarts due to file changes occur sequentially, 
@@ -44,15 +44,15 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
     /// and starting a new one, which would not be thread-safe without some form of synchronization.
     /// </summary>
     // private readonly SemaphoreSlim restartServerLock = new(1, 1);
-    private Task lastRestartTask = Task.CompletedTask;
+    private Task _lastRestartTask = Task.CompletedTask;
 
-    private HttpListener? listener;
+    private HttpListener? _listener;
 
-    private IServerHandlers[]? handlers;
+    private IServerHandlers[]? _handlers;
 
-    private DateTime serverStartTime;
+    private DateTime _serverStartTime;
 
-    private Task? loop;
+    private Task? _loop;
 
     /// <summary>
     /// Constructor for the ServeCommand class.
@@ -64,13 +64,13 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
     public ServeCommand(ServeOptions options, ILogger logger, IFileWatcher fileWatcher, IFileSystem fs)
         : base(options, logger, fs)
     {
-        this.options = options ?? throw new ArgumentNullException(nameof(options));
-        this.fileWatcher = fileWatcher ?? throw new ArgumentNullException(nameof(fileWatcher));
+        this._options = options ?? throw new ArgumentNullException(nameof(options));
+        this._fileWatcher = fileWatcher ?? throw new ArgumentNullException(nameof(fileWatcher));
 
         // Watch for file changes in the specified path
-        var SourceAbsolutePath = Path.GetFullPath(options.Source);
-        logger.Information("Watching for file changes in {SourceAbsolutePath}", SourceAbsolutePath);
-        fileWatcher.Start(SourceAbsolutePath, OnSourceFileChanged);
+        var sourceAbsolutePath = Path.GetFullPath(options.Source);
+        logger.Information("Watching for file changes in {SourceAbsolutePath}", sourceAbsolutePath);
+        fileWatcher.Start(sourceAbsolutePath, OnSourceFileChanged);
     }
 
     /// <summary>
@@ -78,68 +78,68 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
     /// </summary>
     public void StartServer()
     {
-        StartServer(baseURLDefault, portDefault);
+        StartServer(BaseUrlDefault, PortDefault);
     }
 
     /// <summary>
     /// Starts the server asynchronously.
     /// </summary>
-    /// <param name="baseURL"></param>
-    public void StartServer(string baseURL)
+    /// <param name="baseUrl"></param>
+    public void StartServer(string baseUrl)
     {
-        StartServer(baseURL, portDefault);
+        StartServer(baseUrl, PortDefault);
     }
 
     /// <summary>
     /// Starts the server asynchronously.
     /// </summary>
-    /// <param name="baseURL">The base URL for the server.</param>
+    /// <param name="baseUrl">The base URL for the server.</param>
     /// <param name="port">The port number for the server.</param>
     /// <returns>A Task representing the asynchronous operation.</returns>
-    public void StartServer(string baseURL, int port)
+    public void StartServer(string baseUrl, int port)
     {
-        logger.Information("Starting server...");
+        Logger.Information("Starting server...");
 
         // Generate the build report
-        stopwatch.LogReport(site.Title);
+        Stopwatch.LogReport(Site.Title);
 
-        serverStartTime = DateTime.UtcNow;
+        _serverStartTime = DateTime.UtcNow;
 
-        handlers = [
+        _handlers = [
             new PingRequests(),
-            new StaticFileRequest(site.SourceStaticPath, false),
-            new StaticFileRequest(site.Theme?.StaticFolder, true),
-            new RegisteredPageRequest(site),
-            new RegisteredPageResourceRequest(site)
+            new StaticFileRequest(Site.SourceStaticPath, false),
+            new StaticFileRequest(Site.Theme?.StaticFolder, true),
+            new RegisteredPageRequest(Site),
+            new RegisteredPageResourceRequest(Site)
         ];
-        listener = new HttpListener();
-        listener.Prefixes.Add($"{baseURL}:{port}/");
-        listener.Start();
+        _listener = new HttpListener();
+        _listener.Prefixes.Add($"{baseUrl}:{port}/");
+        _listener.Start();
 
-        logger.Information("You site is live: {baseURL}:{port}", baseURL, port);
+        Logger.Information("You site is live: {baseURL}:{port}", baseUrl, port);
 
-        loop = Task.Run(async () =>
+        _loop = Task.Run(async () =>
         {
-            while (listener is not null && listener.IsListening)
+            while (_listener is not null && _listener.IsListening)
             {
                 try
                 {
-                    var context = await listener.GetContextAsync().ConfigureAwait(false);
+                    var context = await _listener.GetContextAsync().ConfigureAwait(false);
                     await HandleRequest(context).ConfigureAwait(false);
                 }
                 catch (HttpListenerException ex)
                 {
-                    if (listener.IsListening)
+                    if (_listener.IsListening)
                     {
-                        logger.Error(ex, "Unexpected listener error.");
+                        Logger.Error(ex, "Unexpected listener error.");
                     }
                     break;
                 }
                 catch (Exception ex)
                 {
-                    if (listener.IsListening)
+                    if (_listener.IsListening)
                     {
-                        logger.Error(ex, "Error processing request.");
+                        Logger.Error(ex, "Error processing request.");
                     }
                     break;
                 }
@@ -150,10 +150,10 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
     /// <inheritdoc/>
     public void Dispose()
     {
-        listener?.Stop();
-        listener?.Close();
-        fileWatcher.Stop();
-        debounceTimer?.Dispose();
+        _listener?.Stop();
+        _listener?.Close();
+        _fileWatcher.Stop();
+        _debounceTimer?.Dispose();
         GC.SuppressFinalize(this);
     }
 
@@ -162,30 +162,30 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
     /// </summary>
     private async Task RestartServer()
     {
-        _ = await lastRestartTask.ContinueWith(async _ =>
+        _ = await _lastRestartTask.ContinueWith(async _ =>
         {
-            logger.Information($"Restarting server...");
+            Logger.Information($"Restarting server...");
 
-            if (listener != null && listener.IsListening)
+            if (_listener != null && _listener.IsListening)
             {
-                listener.Stop();
-                listener.Close();
+                _listener.Stop();
+                _listener.Close();
 
-                if (loop is not null)
+                if (_loop is not null)
                 {
                     // Wait for the loop to finish processing any ongoing requests.
-                    await loop.ConfigureAwait(false);
-                    loop.Dispose();
+                    await _loop.ConfigureAwait(false);
+                    _loop.Dispose();
                 }
             }
 
             // Reinitialize the site
-            site = SiteHelper.Init(configFile, options, Parser, logger, stopwatch, fs);
+            Site = SiteHelper.Init(ConfigFile, _options, Parser, Logger, Stopwatch, Fs);
 
             StartServer();
         }).ConfigureAwait(false);
 
-        lastRestartTask = lastRestartTask.ContinueWith(t => t.Exception != null
+        _lastRestartTask = _lastRestartTask.ContinueWith(t => t.Exception != null
             ? throw t.Exception
             : Task.CompletedTask);
     }
@@ -199,10 +199,10 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
         var requestPath = context.Request.Url?.AbsolutePath ?? string.Empty;
 
         string? resultType = null;
-        if (handlers is not null)
+        if (_handlers is not null)
         {
             var response = new HttpListenerResponseWrapper(context.Response);
-            foreach (var item in handlers)
+            foreach (var item in _handlers)
             {
                 if (!item.Check(requestPath))
                 {
@@ -211,12 +211,12 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
 
                 try
                 {
-                    resultType = await item.Handle(response, requestPath, serverStartTime).ConfigureAwait(false);
+                    resultType = await item.Handle(response, requestPath, _serverStartTime).ConfigureAwait(false);
                     break;
                 }
                 catch (Exception ex)
                 {
-                    logger.Debug(ex, "Error handling the request.");
+                    Logger.Debug(ex, "Error handling the request.");
                 }
             }
         }
@@ -230,7 +230,7 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
         {
             context.Response.OutputStream.Close();
         }
-        logger.Debug("Request {type}\tfor {RequestPath}", resultType, requestPath);
+        Logger.Debug("Request {type}\tfor {RequestPath}", resultType, requestPath);
     }
 
     private static async Task HandleNotFoundRequest(HttpListenerContext context)
@@ -254,8 +254,8 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
 
         // File changes are firing multiple events in a short time.
         // Debounce the event handler to prevent multiple events from firing in a short time
-        debounceTimer?.Dispose();
-        debounceTimer = new Timer(DebounceCallback, e, TimeSpan.FromMilliseconds(1), Timeout.InfiniteTimeSpan);
+        _debounceTimer?.Dispose();
+        _debounceTimer = new Timer(DebounceCallback, e, TimeSpan.FromMilliseconds(1), Timeout.InfiniteTimeSpan);
     }
 
     private async void DebounceCallback(object? state)
diff --git a/source/Helpers/FileUtils.cs b/source/Helpers/FileUtils.cs
index fd1ae1d..00220b0 100644
--- a/source/Helpers/FileUtils.cs
+++ b/source/Helpers/FileUtils.cs
@@ -22,7 +22,7 @@ public static class FileUtils
 
         var index = (page.Section, page.Kind, page.Type);
 
-        var cache = isBaseTemplate ? cacheManager.baseTemplateCache : cacheManager.contentTemplateCache;
+        var cache = isBaseTemplate ? cacheManager.BaseTemplateCache : cacheManager.ContentTemplateCache;
 
         // Check if the template content is already cached
         if (cache.TryGetValue(index, out var content))
diff --git a/source/Helpers/IFileWatcher.cs b/source/Helpers/IFileWatcher.cs
index 75e2045..19ae658 100644
--- a/source/Helpers/IFileWatcher.cs
+++ b/source/Helpers/IFileWatcher.cs
@@ -8,10 +8,10 @@ public interface IFileWatcher
     /// <summary>
     /// Starts the file watcher to monitor file changes in the specified source path.
     /// </summary>
-    /// <param name="SourceAbsolutePath">The path to the source directory.</param>
-    /// <param name="OnSourceFileChanged"></param>
+    /// <param name="sourceAbsolutePath">The path to the source directory.</param>
+    /// <param name="onSourceFileChanged"></param>
     /// <returns>The created FileSystemWatcher object.</returns>
-    void Start(string SourceAbsolutePath, Action<object, FileSystemEventArgs> OnSourceFileChanged);
+    void Start(string sourceAbsolutePath, Action<object, FileSystemEventArgs> onSourceFileChanged);
 
     /// <summary>
     /// Disposes the file watcher
diff --git a/source/Helpers/SiteCacheManager.cs b/source/Helpers/SiteCacheManager.cs
index e722bd7..05839d0 100644
--- a/source/Helpers/SiteCacheManager.cs
+++ b/source/Helpers/SiteCacheManager.cs
@@ -11,25 +11,25 @@ public class SiteCacheManager
     /// <summary>
     /// Cache for content templates.
     /// </summary>
-    public Dictionary<(string?, Kind?, string?), string> contentTemplateCache { get; } = [];
+    public Dictionary<(string?, Kind?, string?), string> ContentTemplateCache { get; } = [];
 
     /// <summary>
     /// Cache for base templates.
     /// </summary>
-    public Dictionary<(string?, Kind?, string?), string> baseTemplateCache { get; } = [];
+    public Dictionary<(string?, Kind?, string?), string> BaseTemplateCache { get; } = [];
 
     /// <summary>
     /// Cache for tag page.
     /// </summary>
-    public ConcurrentDictionary<string, Lazy<IPage>> automaticContentCache { get; } = new();
+    public ConcurrentDictionary<string, Lazy<IPage>> AutomaticContentCache { get; } = new();
 
     /// <summary>
     /// Resets the template cache to force a reload of all templates.
     /// </summary>
     public void ResetCache()
     {
-        baseTemplateCache.Clear();
-        contentTemplateCache.Clear();
-        automaticContentCache.Clear();
+        BaseTemplateCache.Clear();
+        ContentTemplateCache.Clear();
+        AutomaticContentCache.Clear();
     }
 }
diff --git a/source/Helpers/SourceFileWatcher.cs b/source/Helpers/SourceFileWatcher.cs
index 2a8e215..794223e 100644
--- a/source/Helpers/SourceFileWatcher.cs
+++ b/source/Helpers/SourceFileWatcher.cs
@@ -11,32 +11,32 @@ public sealed class SourceFileWatcher : IFileWatcher, IDisposable
     /// remains up-to-date. The FileSystemWatcher is configured with the source directory
     /// at construction and starts watching immediately.
     /// </summary>
-    private FileSystemWatcher? fileWatcher;
+    private FileSystemWatcher? _fileWatcher;
 
     /// <inheritdoc/>
-    public void Start(string SourceAbsolutePath, Action<object, FileSystemEventArgs> OnSourceFileChanged)
+    public void Start(string sourceAbsolutePath, Action<object, FileSystemEventArgs> onSourceFileChanged)
     {
-        ArgumentNullException.ThrowIfNull(OnSourceFileChanged);
+        ArgumentNullException.ThrowIfNull(onSourceFileChanged);
 
-        fileWatcher = new FileSystemWatcher
+        _fileWatcher = new FileSystemWatcher
         {
-            Path = SourceAbsolutePath,
+            Path = sourceAbsolutePath,
             NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.FileName | NotifyFilters.DirectoryName,
             IncludeSubdirectories = true,
             EnableRaisingEvents = true
         };
 
         // Subscribe to the desired events
-        fileWatcher.Changed += new FileSystemEventHandler(OnSourceFileChanged.Invoke);
-        fileWatcher.Created += new FileSystemEventHandler(OnSourceFileChanged.Invoke);
-        fileWatcher.Deleted += new FileSystemEventHandler(OnSourceFileChanged.Invoke);
-        fileWatcher.Renamed += new RenamedEventHandler(OnSourceFileChanged);
+        _fileWatcher.Changed += new FileSystemEventHandler(onSourceFileChanged.Invoke);
+        _fileWatcher.Created += new FileSystemEventHandler(onSourceFileChanged.Invoke);
+        _fileWatcher.Deleted += new FileSystemEventHandler(onSourceFileChanged.Invoke);
+        _fileWatcher.Renamed += new RenamedEventHandler(onSourceFileChanged);
     }
 
     /// <inheritdoc/>
     public void Stop()
     {
-        fileWatcher?.Dispose();
+        _fileWatcher?.Dispose();
     }
 
     /// <inheritdoc/>
@@ -50,7 +50,7 @@ public sealed class SourceFileWatcher : IFileWatcher, IDisposable
     {
         if (disposing)
         {
-            fileWatcher?.Dispose();
+            _fileWatcher?.Dispose();
         }
     }
 }
diff --git a/source/Helpers/StopwatchReporter.cs b/source/Helpers/StopwatchReporter.cs
index 62d8941..f1a57fe 100644
--- a/source/Helpers/StopwatchReporter.cs
+++ b/source/Helpers/StopwatchReporter.cs
@@ -12,18 +12,18 @@ namespace SuCoS.Helpers;
 /// </summary>
 public class StopwatchReporter
 {
-    private readonly ILogger logger;
-    private readonly Dictionary<string, Stopwatch> stopwatches;
-    private readonly Dictionary<string, int> itemCounts;
+    private readonly ILogger _logger;
+    private readonly Dictionary<string, Stopwatch> _stopwatches;
+    private readonly Dictionary<string, int> _itemCounts;
 
     /// <summary>
     /// Constructor
     /// </summary>
     public StopwatchReporter(ILogger logger)
     {
-        this.logger = logger;
-        stopwatches = [];
-        itemCounts = [];
+        this._logger = logger;
+        _stopwatches = [];
+        _itemCounts = [];
     }
 
     /// <summary>
@@ -32,10 +32,10 @@ public class StopwatchReporter
     /// <param name="stepName"></param>
     public void Start(string stepName)
     {
-        if (!stopwatches.TryGetValue(stepName, out var stopwatch))
+        if (!_stopwatches.TryGetValue(stepName, out var stopwatch))
         {
             stopwatch = new Stopwatch();
-            stopwatches[stepName] = stopwatch;
+            _stopwatches[stepName] = stopwatch;
         }
 
         stopwatch.Restart();
@@ -49,13 +49,13 @@ public class StopwatchReporter
     /// <exception cref="ArgumentException"></exception>
     public void Stop(string stepName, int itemCount)
     {
-        if (!stopwatches.TryGetValue(stepName, out var stopwatch))
+        if (!_stopwatches.TryGetValue(stepName, out var stopwatch))
         {
             throw new ArgumentException($"Step '{stepName}' has not been started.");
         }
 
         stopwatch.Stop();
-        itemCounts[stepName] = itemCount;
+        _itemCounts[stepName] = itemCount;
     }
 
     /// <summary>
@@ -69,9 +69,9 @@ public class StopwatchReporter
             ("Step", "Status", "Duration", 0)
         };
 
-        foreach (var (stepName, stopwatch) in stopwatches)
+        foreach (var (stepName, stopwatch) in _stopwatches)
         {
-            _ = itemCounts.TryGetValue(stepName, out var itemCount);
+            _ = _itemCounts.TryGetValue(stepName, out var itemCount);
             var duration = stopwatch.ElapsedMilliseconds;
             var durationString = $"{duration} ms";
             var status = itemCount > 0 ? itemCount.ToString(CultureInfo.InvariantCulture) : string.Empty;
@@ -79,7 +79,7 @@ public class StopwatchReporter
             reportData.Add((Step: stepName, Status: status, DurationString: durationString, Duration: duration));
         }
 
-        var totalDurationAllSteps = stopwatches.Values.Sum(sw => sw.ElapsedMilliseconds);
+        var totalDurationAllSteps = _stopwatches.Values.Sum(sw => sw.ElapsedMilliseconds);
 
         var report = new StringBuilder($@"Site '{siteTitle}' created!
 ═════════════════════════════════════════════");
@@ -102,6 +102,6 @@ Total                     {totalDurationAllSteps} ms
 ═════════════════════════════════════════════");
 
         // Log the report
-        logger.Information(report.ToString(), siteTitle);
+        _logger.Information(report.ToString(), siteTitle);
     }
 }
diff --git a/source/Models/Bundle.cs b/source/Models/Bundle.cs
index 1a8d7db..aa4be65 100644
--- a/source/Models/Bundle.cs
+++ b/source/Models/Bundle.cs
@@ -8,15 +8,15 @@ public enum BundleType
     /// <summary>
     /// Regular page. Not a bundle.
     /// </summary>
-    none,
+    None,
 
     /// <summary>
     /// Bundle with no childre
     /// </summary>
-    leaf,
+    Leaf,
 
     /// <summary>
     /// Bundle with children embeded, like a home page, taxonomy term, taxonomy list
     /// </summary>
-    branch
+    Branch
 }
diff --git a/source/Models/CommandLineOptions/CheckLinkOptions.cs b/source/Models/CommandLineOptions/CheckLinkOptions.cs
index a99caec..f133bf7 100644
--- a/source/Models/CommandLineOptions/CheckLinkOptions.cs
+++ b/source/Models/CommandLineOptions/CheckLinkOptions.cs
@@ -36,5 +36,5 @@ public class CheckLinkOptions
     /// Site URL, so it can be checked as local path files.
     /// </summary>
     [Option('u', "url", Required = false, HelpText = "Site URL, so it can be checked as local path files.")]
-    public string? InternalURL { get; init; }
+    public string? InternalUrl { get; init; }
 }
diff --git a/source/Models/CommandLineOptions/NewSiteOptions.cs b/source/Models/CommandLineOptions/NewSiteOptions.cs
index 6584a1e..12c5a99 100644
--- a/source/Models/CommandLineOptions/NewSiteOptions.cs
+++ b/source/Models/CommandLineOptions/NewSiteOptions.cs
@@ -36,5 +36,5 @@ public class NewSiteOptions
     /// Site base url.
     /// </summary>
     [Option("url", Required = false, HelpText = "Site base url")]
-    public string BaseURL { get; init; } = "https://example.org/";
+    public string BaseUrl { get; init; } = "https://example.org/";
 }
diff --git a/source/Models/FrontMatter.cs b/source/Models/FrontMatter.cs
index 2895bd8..236d9ca 100644
--- a/source/Models/FrontMatter.cs
+++ b/source/Models/FrontMatter.cs
@@ -21,7 +21,7 @@ public class FrontMatter : IFrontMatter
     public string? Type { get; set; } = "page";
 
     /// <inheritdoc/>
-    public string? URL { get; set; }
+    public string? Url { get; set; }
 
     /// <inheritdoc/>
     public bool? Draft { get; set; }
@@ -59,7 +59,7 @@ public class FrontMatter : IFrontMatter
 
     /// <inheritdoc/>
     [YamlIgnore]
-    public Kind Kind { get; set; } = Kind.single;
+    public Kind Kind { get; set; } = Kind.Single;
 
     /// <inheritdoc/>
     [YamlIgnore]
diff --git a/source/Models/IFrontMatter.cs b/source/Models/IFrontMatter.cs
index 2a6f176..d060591 100644
--- a/source/Models/IFrontMatter.cs
+++ b/source/Models/IFrontMatter.cs
@@ -44,7 +44,7 @@ public interface IFrontMatter : IParams, IFile
     /// </code>
     /// will try to convert <code>page.Parent.Title</code> and <code>page.Title</code>.
     /// </example>
-    string? URL { get; }
+    string? Url { get; }
 
     /// <summary>
     /// True for draft content. It will not be rendered unless 
@@ -81,7 +81,7 @@ public interface IFrontMatter : IParams, IFile
     /// A List of secondary URL patterns to be used to create the url.
     /// List URL, it will be parsed as liquid templates, so you can use page variables.
     /// </summary>
-    /// <see cref="URL"/>
+    /// <see cref="Url"/>
     List<string>? Aliases { get; }
 
     /// <summary>
diff --git a/source/Models/IPage.cs b/source/Models/IPage.cs
index 83b7e0e..0937c7f 100644
--- a/source/Models/IPage.cs
+++ b/source/Models/IPage.cs
@@ -75,14 +75,14 @@ public interface IPage : IFrontMatter, IOutput
     /// <summary>
     /// Just a simple check if the current page is a "page"
     /// </summary>
-    public bool IsPage => Kind == Kind.single;
+    public bool IsPage => Kind == Kind.Single;
 
     /// <summary>
     /// The number of words in the main content
     /// </summary>
-    public int WordCount => Plain.Split(nonWords, StringSplitOptions.RemoveEmptyEntries).Length;
+    public int WordCount => Plain.Split(NonWords, StringSplitOptions.RemoveEmptyEntries).Length;
 
-    private static readonly char[] nonWords = [' ', ',', ';', '.', '!', '"', '(', ')', '?', '\n', '\r'];
+    private static readonly char[] NonWords = [' ', ',', ';', '.', '!', '"', '(', ')', '?', '\n', '\r'];
 
     /// <summary>
     /// The markdown content converted to HTML
@@ -114,14 +114,14 @@ public interface IPage : IFrontMatter, IOutput
     /// <summary>
     /// Get all URLs related to this content.
     /// </summary>
-    public Dictionary<string, IOutput> AllOutputURLs { get; }
+    public Dictionary<string, IOutput> AllOutputUrLs { get; }
 
     /// <summary>
     /// Gets the Permalink path for the file.
     /// </summary>
-    /// <param name="URLforce">The URL to consider. If null use the predefined URL</param>
+    /// <param name="urLforce">The URL to consider. If null use the predefined URL</param>
     /// <returns>The output path.</returns>
-    public string CreatePermalink(string? URLforce = null);
+    public string CreatePermalink(string? urLforce = null);
 
     /// <summary>
     /// Final steps of parsing the content.
diff --git a/source/Models/ISiteSettings.cs b/source/Models/ISiteSettings.cs
index 2bbda14..8dd2248 100644
--- a/source/Models/ISiteSettings.cs
+++ b/source/Models/ISiteSettings.cs
@@ -23,10 +23,10 @@ public interface ISiteSettings : IParams
     /// <summary>
     /// The base URL that will be used to build public links.
     /// </summary>
-    public string BaseURL { get; }
+    public string BaseUrl { get; }
 
     /// <summary>
     /// The appearance of a URL is either ugly or pretty.
     /// </summary>
-    public bool UglyURLs { get; }
+    public bool UglyUrLs { get; }
 }
diff --git a/source/Models/Kind.cs b/source/Models/Kind.cs
index 799009f..99625fc 100644
--- a/source/Models/Kind.cs
+++ b/source/Models/Kind.cs
@@ -8,15 +8,15 @@ public enum Kind
     /// <summary>
     /// A single content page.
     /// </summary>
-    single,
+    Single,
 
     /// <summary>
     /// List of contents
     /// </summary>
-    list,
+    List,
 
     /// <summary>
     /// Special page, like the home page. It will be rendered as index.html.
     /// </summary>
-    index
+    Index
 }
diff --git a/source/Models/Page.cs b/source/Models/Page.cs
index aaa16e5..a9cc141 100644
--- a/source/Models/Page.cs
+++ b/source/Models/Page.cs
@@ -11,83 +11,83 @@ namespace SuCoS.Models;
 /// </summary>
 public class Page : IPage
 {
-    private readonly IFrontMatter frontMatter;
+    private readonly IFrontMatter _frontMatter;
 
     #region IFrontMatter
 
     /// <inheritdoc/>
-    public string? Title => frontMatter.Title;
+    public string? Title => _frontMatter.Title;
 
     /// <inheritdoc/>
-    public string? Type => frontMatter.Type;
+    public string? Type => _frontMatter.Type;
 
     /// <inheritdoc/>
-    public string? URL => frontMatter.URL;
+    public string? Url => _frontMatter.Url;
 
     /// <inheritdoc/>
-    public bool? Draft => frontMatter.Draft;
+    public bool? Draft => _frontMatter.Draft;
 
     /// <inheritdoc/>
-    public List<string>? Aliases => frontMatter.Aliases;
+    public List<string>? Aliases => _frontMatter.Aliases;
 
     /// <inheritdoc/>
-    public string? Section => frontMatter.Section;
+    public string? Section => _frontMatter.Section;
 
     /// <inheritdoc/>
-    public DateTime? Date => frontMatter.Date;
+    public DateTime? Date => _frontMatter.Date;
 
     /// <inheritdoc/>
-    public DateTime? LastMod => frontMatter.LastMod;
+    public DateTime? LastMod => _frontMatter.LastMod;
 
     /// <inheritdoc/>
-    public DateTime? PublishDate => frontMatter.PublishDate;
+    public DateTime? PublishDate => _frontMatter.PublishDate;
 
     /// <inheritdoc/>
-    public DateTime? ExpiryDate => frontMatter.ExpiryDate;
+    public DateTime? ExpiryDate => _frontMatter.ExpiryDate;
 
     /// <inheritdoc/>
-    public int Weight => frontMatter.Weight;
+    public int Weight => _frontMatter.Weight;
 
     /// <inheritdoc/>
-    public List<string>? Tags => frontMatter.Tags;
+    public List<string>? Tags => _frontMatter.Tags;
 
     /// <inheritdoc/>
     public List<FrontMatterResources>? ResourceDefinitions
     {
-        get => frontMatter.ResourceDefinitions;
-        set => frontMatter.ResourceDefinitions = value;
+        get => _frontMatter.ResourceDefinitions;
+        set => _frontMatter.ResourceDefinitions = value;
     }
 
     /// <inheritdoc/>
-    public string RawContent => frontMatter.RawContent;
+    public string RawContent => _frontMatter.RawContent;
 
     /// <inheritdoc/>
     public Kind Kind
     {
-        get => frontMatter.Kind;
-        set => (frontMatter as FrontMatter)!.Kind = value;
+        get => _frontMatter.Kind;
+        set => (_frontMatter as FrontMatter)!.Kind = value;
     }
 
     /// <inheritdoc/>
-    public string? SourceRelativePath => frontMatter.SourceRelativePath;
+    public string? SourceRelativePath => _frontMatter.SourceRelativePath;
 
     /// <inheritdoc/>
-    public string? SourceRelativePathDirectory => frontMatter.SourceRelativePathDirectory;
+    public string? SourceRelativePathDirectory => _frontMatter.SourceRelativePathDirectory;
 
     /// <inheritdoc/>
-    public string SourceFullPath => frontMatter.SourceFullPath;
+    public string SourceFullPath => _frontMatter.SourceFullPath;
 
     /// <inheritdoc/>
-    public string? SourceFullPathDirectory => frontMatter.SourceFullPathDirectory;
+    public string? SourceFullPathDirectory => _frontMatter.SourceFullPathDirectory;
 
     /// <inheritdoc/>
-    public string? SourceFileNameWithoutExtension => frontMatter.SourceFileNameWithoutExtension;
+    public string? SourceFileNameWithoutExtension => _frontMatter.SourceFileNameWithoutExtension;
 
     /// <inheritdoc/>
     public Dictionary<string, object> Params
     {
-        get => frontMatter.Params;
-        set => frontMatter.Params = value;
+        get => _frontMatter.Params;
+        set => _frontMatter.Params = value;
     }
 
     #endregion IFrontMatter
@@ -122,7 +122,7 @@ public class Page : IPage
     public IPage? Parent { get; set; }
 
     /// <inheritdoc/>
-    public BundleType BundleType { get; set; } = BundleType.none;
+    public BundleType BundleType { get; set; } = BundleType.None;
 
     /// <inheritdoc/>
     public Collection<Resource>? Resources { get; set; }
@@ -150,19 +150,19 @@ public class Page : IPage
     /// <summary>
     /// Just a simple check if the current page is a "page"
     /// </summary>
-    public bool IsPage => Kind == Kind.single;
+    public bool IsPage => Kind == Kind.Single;
 
     /// <summary>
     /// The number of words in the main content
     /// </summary>
-    public int WordCount => Plain.Split(nonWords, StringSplitOptions.RemoveEmptyEntries).Length;
+    public int WordCount => Plain.Split(NonWords, StringSplitOptions.RemoveEmptyEntries).Length;
 
-    private static readonly char[] nonWords = [' ', ',', ';', '.', '!', '"', '(', ')', '?', '\n', '\r'];
+    private static readonly char[] NonWords = [' ', ',', ';', '.', '!', '"', '(', ')', '?', '\n', '\r'];
 
     /// <summary>
     /// The markdown content converted to HTML
     /// </summary>
-    public string ContentPreRendered => contentPreRenderedCached.Value;
+    public string ContentPreRendered => ContentPreRenderedCached.Value;
 
     /// <summary>
     /// The processed content.
@@ -171,8 +171,8 @@ public class Page : IPage
     {
         get
         {
-            contentCache = ParseAndRenderTemplate(false, "Error rendering theme template: {Error}");
-            return contentCache!;
+            ContentCache = ParseAndRenderTemplate(false, "Error rendering theme template: {Error}");
+            return ContentCache!;
         }
     }
 
@@ -190,21 +190,21 @@ public class Page : IPage
     {
         get
         {
-            if (pagesCached is not null)
+            if (PagesCached is not null)
             {
-                return pagesCached;
+                return PagesCached;
             }
 
-            pagesCached = [];
+            PagesCached = [];
             foreach (var permalink in PagesReferences)
             {
                 var page = Site.OutputReferences[permalink] as IPage;
                 if (page is not null)
                 {
-                    pagesCached.Add(page);
+                    PagesCached.Add(page);
                 }
             }
-            return pagesCached;
+            return PagesCached;
         }
     }
 
@@ -215,17 +215,17 @@ public class Page : IPage
     {
         get
         {
-            regularPagesCache ??= Pages
-                    .Where(page => page.Kind == Kind.single)
+            _regularPagesCache ??= Pages
+                    .Where(page => page.Kind == Kind.Single)
                     .ToList();
-            return regularPagesCache;
+            return _regularPagesCache;
         }
     }
 
     /// <summary>
     /// Get all URLs related to this content.
     /// </summary>
-    public Dictionary<string, IOutput> AllOutputURLs
+    public Dictionary<string, IOutput> AllOutputUrLs
     {
         get
         {
@@ -266,14 +266,14 @@ public class Page : IPage
     /// <summary>
     /// The markdown content.
     /// </summary>
-    private Lazy<string> contentPreRenderedCached => new(() => Markdown.ToHtml(RawContent, SiteHelper.MarkdownPipeline));
+    private Lazy<string> ContentPreRenderedCached => new(() => Markdown.ToHtml(RawContent, SiteHelper.MarkdownPipeline));
 
     /// <summary>
     /// The cached content.
     /// </summary>
-    private string? contentCache { get; set; }
+    private string? ContentCache { get; set; }
 
-    private const string urlForIndex = @"{%- liquid 
+    private const string UrlForIndex = @"{%- liquid 
 if page.Parent
 echo page.Parent.Permalink
 echo '/'
@@ -284,7 +284,7 @@ else
 echo page.SourcePathLastDirectory
 endif
 -%}";
-    private const string urlForNonIndex = @"{%- liquid 
+    private const string UrlForNonIndex = @"{%- liquid 
 if page.Parent
 echo page.Parent.Permalink
 echo '/'
@@ -296,41 +296,41 @@ echo page.SourceFileNameWithoutExtension
 endif
 -%}";
 
-    private List<IPage>? regularPagesCache;
+    private List<IPage>? _regularPagesCache;
 
-    private List<IPage>? pagesCached { get; set; }
+    private List<IPage>? PagesCached { get; set; }
 
     /// <summary>
     /// Constructor
     /// </summary>
     public Page(in IFrontMatter frontMatter, in ISite site)
     {
-        this.frontMatter = frontMatter;
+        this._frontMatter = frontMatter;
         Site = site;
     }
 
     /// <summary>
     /// Gets the Permalink path for the file.
     /// </summary>
-    /// <param name="URLforce">The URL to consider. If null use the predefined URL</param>
+    /// <param name="urLforce">The URL to consider. If null use the predefined URL</param>
     /// <returns>The output path.</returns>
-    /// <see cref="urlForIndex"/>
-    /// <see cref="urlForNonIndex"/>
-    public string CreatePermalink(string? URLforce = null)
+    /// <see cref="UrlForIndex"/>
+    /// <see cref="UrlForNonIndex"/>
+    public string CreatePermalink(string? urLforce = null)
     {
         var isIndex = SourceFileNameWithoutExtension == "index";
 
         var permaLink = string.Empty;
 
-        URLforce ??= URL ?? (isIndex ? urlForIndex : urlForNonIndex);
+        urLforce ??= Url ?? (isIndex ? UrlForIndex : UrlForNonIndex);
 
         try
         {
-            permaLink = Site.TemplateEngine.Parse(URLforce, Site, this);
+            permaLink = Site.TemplateEngine.Parse(urLforce, Site, this);
         }
         catch (Exception ex)
         {
-            Site.Logger.Error(ex, "Error converting URL: {URLforce}", URLforce);
+            Site.Logger.Error(ex, "Error converting URL: {URLforce}", urLforce);
         }
 
         if (!Path.IsPathRooted(permaLink) && !permaLink.StartsWith('/'))
@@ -366,17 +366,17 @@ endif
         ScanForResources();
     }
 
-    private int counterInternal;
-    private bool counterInternalLock;
-    private int counter
+    private int _counterInternal;
+    private bool _counterInternalLock;
+    private int Counter
     {
         get
         {
-            if (!counterInternalLock)
+            if (!_counterInternalLock)
             {
-                counterInternalLock = true;
+                _counterInternalLock = true;
             }
-            return counterInternal;
+            return _counterInternal;
         }
     }
 
@@ -386,7 +386,7 @@ endif
         {
             return;
         }
-        if (BundleType == BundleType.none)
+        if (BundleType == BundleType.None)
         {
             return;
         }
@@ -396,7 +396,7 @@ endif
             var resourceFiles = Directory.GetFiles(SourceFullPathDirectory)
                 .Where(file =>
                     file != SourceFullPath &&
-                    (BundleType == BundleType.leaf || !file.EndsWith(".md", StringComparison.OrdinalIgnoreCase))
+                    (BundleType == BundleType.Leaf || !file.EndsWith(".md", StringComparison.OrdinalIgnoreCase))
                     );
 
             foreach (var resourceFilename in resourceFiles)
@@ -410,10 +410,10 @@ endif
 
                 if (ResourceDefinitions is not null)
                 {
-                    if (counterInternalLock)
+                    if (_counterInternalLock)
                     {
-                        counterInternalLock = false;
-                        ++counterInternal;
+                        _counterInternalLock = false;
+                        ++_counterInternal;
                     }
                     foreach (var resourceDefinition in ResourceDefinitions)
                     {
@@ -422,8 +422,8 @@ endif
                         var file = new InMemoryDirectoryInfo("./", new[] { filenameOriginal });
                         if (resourceDefinition.GlobMatcher.Execute(file).HasMatches)
                         {
-                            filename = Site.TemplateEngine.ParseResource(resourceDefinition.Name, Site, this, counter) ?? filename;
-                            title = Site.TemplateEngine.ParseResource(resourceDefinition.Title, Site, this, counter) ?? filename;
+                            filename = Site.TemplateEngine.ParseResource(resourceDefinition.Name, Site, this, Counter) ?? filename;
+                            title = Site.TemplateEngine.ParseResource(resourceDefinition.Title, Site, this, Counter) ?? filename;
                             resourceParams = resourceDefinition.Params ?? [];
                         }
                     }
diff --git a/source/Models/Site.cs b/source/Models/Site.cs
index 16338f3..b3a610d 100644
--- a/source/Models/Site.cs
+++ b/source/Models/Site.cs
@@ -17,8 +17,8 @@ public class Site : ISite
     /// <inheritdoc/>
     public Dictionary<string, object> Params
     {
-        get => settings.Params;
-        set => settings.Params = value;
+        get => _settings.Params;
+        set => _settings.Params = value;
     }
 
     #endregion IParams
@@ -31,19 +31,19 @@ public class Site : ISite
     #region SiteSettings
 
     /// <inheritdoc/>
-    public string Title => settings.Title;
+    public string Title => _settings.Title;
 
     /// <inheritdoc/>
-    public string? Description => settings.Description;
+    public string? Description => _settings.Description;
 
     /// <inheritdoc/>
-    public string? Copyright => settings.Copyright;
+    public string? Copyright => _settings.Copyright;
 
     /// <inheritdoc/>
-    public string BaseURL => settings.BaseURL;
+    public string BaseUrl => _settings.BaseUrl;
 
     /// <inheritdoc/>
-    public bool UglyURLs => settings.UglyURLs;
+    public bool UglyUrLs => _settings.UglyUrLs;
 
     #endregion SiteSettings
 
@@ -60,7 +60,7 @@ public class Site : ISite
     /// <summary>
     /// The path theme.
     /// </summary>
-    public string SourceThemePath => Path.Combine(Options.Source, settings.ThemeDir, settings.Theme ?? string.Empty);
+    public string SourceThemePath => Path.Combine(Options.Source, _settings.ThemeDir, _settings.Theme ?? string.Empty);
 
     /// <inheritdoc/>
     public IEnumerable<string> SourceFolders => [
@@ -81,11 +81,11 @@ public class Site : ISite
     {
         get
         {
-            pagesCache ??= OutputReferences.Values
+            _pagesCache ??= OutputReferences.Values
                 .Where(output => output is IPage page)
                 .Select(output => (output as IPage)!)
                 .OrderBy(page => -page.Weight);
-            return pagesCache!;
+            return _pagesCache!;
         }
     }
 
@@ -101,11 +101,11 @@ public class Site : ISite
     {
         get
         {
-            regularPagesCache ??= OutputReferences
+            _regularPagesCache ??= OutputReferences
                     .Where(pair => pair.Value is IPage page && page.IsPage && pair.Key == page.Permalink)
                     .Select(pair => (pair.Value as IPage)!)
                     .OrderBy(page => -page.Weight);
-            return regularPagesCache;
+            return _regularPagesCache;
         }
     }
 
@@ -127,32 +127,32 @@ public class Site : ISite
     /// <summary>
     /// Number of files parsed, used in the report.
     /// </summary>
-    public int FilesParsedToReport => filesParsedToReport;
+    public int FilesParsedToReport => _filesParsedToReport;
 
     /// <inheritdoc/>
-    public IMetadataParser Parser { get; init; } = new YAMLParser();
+    public IMetadataParser Parser { get; init; } = new YamlParser();
 
-    private int filesParsedToReport;
+    private int _filesParsedToReport;
 
-    private const string indexLeafFileConst = "index.md";
+    private const string IndexLeafFileConst = "index.md";
 
-    private const string indexBranchFileConst = "_index.md";
+    private const string IndexBranchFileConst = "_index.md";
 
     /// <summary>
     /// The synchronization lock object during ProstProcess.
     /// </summary>
-    private readonly object syncLockPostProcess = new();
+    private readonly object _syncLockPostProcess = new();
 
-    private IEnumerable<IPage>? pagesCache;
+    private IEnumerable<IPage>? _pagesCache;
 
-    private IEnumerable<IPage>? regularPagesCache;
+    private IEnumerable<IPage>? _regularPagesCache;
 
-    private readonly SiteSettings settings;
+    private readonly SiteSettings _settings;
 
     /// <summary>
     /// Datetime wrapper
     /// </summary>
-    private readonly ISystemClock clock;
+    private readonly ISystemClock _clock;
 
     /// <inheritdoc/>
     public ITemplateEngine TemplateEngine { get; set; }
@@ -167,12 +167,12 @@ public class Site : ISite
         in ILogger logger, ISystemClock? clock)
     {
         Options = options;
-        this.settings = settings;
+        this._settings = settings;
         Logger = logger;
         Parser = parser;
         TemplateEngine = new FluidTemplateEngine();
 
-        this.clock = clock ?? new SystemClock();
+        this._clock = clock ?? new SystemClock();
 
         Theme = Theme.CreateFromSite(this);
     }
@@ -224,19 +224,19 @@ public class Site : ISite
         relativePath = Urlizer.Path(relativePath);
         FrontMatter frontMatter = new()
         {
-            Kind = isIndex ? Kind.index : Kind.list,
+            Kind = isIndex ? Kind.Index : Kind.List,
             Section = isIndex ? "index" : sectionName,
-            SourceRelativePath = Urlizer.Path(Path.Combine(relativePath, indexLeafFileConst)),
-            SourceFullPath = Urlizer.Path(Path.Combine(SourceContentPath, relativePath, indexLeafFileConst)),
+            SourceRelativePath = Urlizer.Path(Path.Combine(relativePath, IndexLeafFileConst)),
+            SourceFullPath = Urlizer.Path(Path.Combine(SourceContentPath, relativePath, IndexLeafFileConst)),
             Title = title,
             Type = isIndex ? "index" : sectionName,
-            URL = relativePath
+            Url = relativePath
         };
 
-        var id = frontMatter.URL;
+        var id = frontMatter.Url;
 
         // Get or create the page
-        var lazyPage = CacheManager.automaticContentCache.GetOrAdd(id, new Lazy<IPage>(() =>
+        var lazyPage = CacheManager.AutomaticContentCache.GetOrAdd(id, new Lazy<IPage>(() =>
         {
             IPage? parent = null;
             // Check if we need to create a section, even
@@ -248,7 +248,7 @@ public class Site : ISite
 
             var newPage = new Page(frontMatter, this)
             {
-                BundleType = BundleType.branch
+                BundleType = BundleType.Branch
             };
             PostProcessPage(newPage, parent);
             return newPage;
@@ -262,7 +262,7 @@ public class Site : ISite
             return page;
         }
 
-        if (page.Kind != Kind.index)
+        if (page.Kind != Kind.Index)
         {
             page.PagesReferences.Add(originalPage.Permalink);
         }
@@ -278,19 +278,19 @@ public class Site : ISite
 
     private void ParseIndexPage(string? directory, int level, ref IPage? parent, ref string[] markdownFiles)
     {
-        var indexLeafBundlePage = markdownFiles.FirstOrDefault(file => Path.GetFileName(file) == indexLeafFileConst);
+        var indexLeafBundlePage = markdownFiles.FirstOrDefault(file => Path.GetFileName(file) == IndexLeafFileConst);
 
-        var indexBranchBundlePage = markdownFiles.FirstOrDefault(file => Path.GetFileName(file) == indexBranchFileConst);
+        var indexBranchBundlePage = markdownFiles.FirstOrDefault(file => Path.GetFileName(file) == IndexBranchFileConst);
 
         IPage? page = null;
         if (indexLeafBundlePage is not null || indexBranchBundlePage is not null)
         {
             // Determine the file to use and the bundle type
             var selectedFile = indexLeafBundlePage ?? indexBranchBundlePage;
-            var bundleType = selectedFile == indexLeafBundlePage ? BundleType.leaf : BundleType.branch;
+            var bundleType = selectedFile == indexLeafBundlePage ? BundleType.Leaf : BundleType.Branch;
 
             // Remove the selected file from markdownFiles
-            markdownFiles = bundleType == BundleType.leaf
+            markdownFiles = bundleType == BundleType.Leaf
                 ? Array.Empty<string>()
                 : markdownFiles.Where(file => file != selectedFile).ToArray();
 
@@ -304,7 +304,7 @@ public class Site : ISite
             {
                 _ = OutputReferences.TryRemove(page!.Permalink!, out _);
                 page.Permalink = "/";
-                page.Kind = Kind.index;
+                page.Kind = Kind.Index;
 
                 _ = OutputReferences.GetOrAdd(page.Permalink, page);
                 Home = page;
@@ -325,7 +325,7 @@ public class Site : ISite
         }
     }
 
-    private Page? ParseSourceFile(in string fileFullPath, in IPage? parent, BundleType bundleType = BundleType.none)
+    private Page? ParseSourceFile(in string fileFullPath, in IPage? parent, BundleType bundleType = BundleType.None)
     {
         Page? page = null;
         try
@@ -355,7 +355,7 @@ public class Site : ISite
         }
 
         // Use interlocked to safely increment the counter in a multi-threaded environment
-        _ = Interlocked.Increment(ref filesParsedToReport);
+        _ = Interlocked.Increment(ref _filesParsedToReport);
 
         return page;
     }
@@ -372,7 +372,7 @@ public class Site : ISite
 
         page.Parent = parent;
         page.Permalink = page.CreatePermalink();
-        lock (syncLockPostProcess)
+        lock (_syncLockPostProcess)
         {
             if (!OutputReferences.TryGetValue(page.Permalink, out var oldOutput) || overwrite)
             {
@@ -388,7 +388,7 @@ public class Site : ISite
                 }
 
                 // Register the page for all urls
-                foreach (var pageOutput in page.AllOutputURLs)
+                foreach (var pageOutput in page.AllOutputUrLs)
                 {
                     _ = OutputReferences.TryAdd(pageOutput.Key, pageOutput.Value);
                 }
@@ -430,7 +430,7 @@ public class Site : ISite
     {
         ArgumentNullException.ThrowIfNull(frontMatter);
 
-        return frontMatter.ExpiryDate is not null && frontMatter.ExpiryDate <= clock.Now;
+        return frontMatter.ExpiryDate is not null && frontMatter.ExpiryDate <= _clock.Now;
     }
 
     /// <summary>
@@ -440,6 +440,6 @@ public class Site : ISite
     {
         ArgumentNullException.ThrowIfNull(frontMatter);
 
-        return frontMatter.GetPublishDate is null || frontMatter.GetPublishDate <= clock.Now;
+        return frontMatter.GetPublishDate is null || frontMatter.GetPublishDate <= _clock.Now;
     }
 }
diff --git a/source/Models/SiteSettings.cs b/source/Models/SiteSettings.cs
index e24f897..af28478 100644
--- a/source/Models/SiteSettings.cs
+++ b/source/Models/SiteSettings.cs
@@ -23,7 +23,7 @@ public class SiteSettings : ISiteSettings
 
 
     /// <inheritdoc/>
-    public string BaseURL { get; set; } = string.Empty;
+    public string BaseUrl { get; set; } = string.Empty;
 
     /// <inheritdoc/>
     public Dictionary<string, List<string>> Outputs { get; set; } = [];
@@ -43,7 +43,7 @@ public class SiteSettings : ISiteSettings
     /// <summary>
     /// The appearance of a URL is either ugly or pretty.
     /// </summary>
-    public bool UglyURLs { get; set; }
+    public bool UglyUrLs { get; set; }
 
     #region IParams
 
diff --git a/source/Parsers/StaticContext.cs b/source/Parsers/StaticContext.cs
index c0bcf0c..f721b2b 100644
--- a/source/Parsers/StaticContext.cs
+++ b/source/Parsers/StaticContext.cs
@@ -6,6 +6,6 @@ namespace SuCoS.Parser;
 /// The rest of this partial class gets generated at build time
 /// </summary>
 [YamlStaticContext]
-public partial class StaticAOTContext : StaticContext
+public partial class StaticAotContext : StaticContext
 {
 }
diff --git a/source/Parsers/YAMLParser.cs b/source/Parsers/YAMLParser.cs
index f2f212c..fabf550 100644
--- a/source/Parsers/YAMLParser.cs
+++ b/source/Parsers/YAMLParser.cs
@@ -7,19 +7,19 @@ namespace SuCoS.Parser;
 /// <summary>
 /// Responsible for parsing the content front matter using YAML
 /// </summary>
-public class YAMLParser : IMetadataParser
+public class YamlParser : IMetadataParser
 {
     /// <summary>
     /// YamlDotNet parser, strictly set to allow automatically parse only known fields
     /// </summary>
-    private readonly IDeserializer deserializer;
+    private readonly IDeserializer _deserializer;
 
     /// <summary>
     /// ctor
     /// </summary>
-    public YAMLParser()
+    public YamlParser()
     {
-        deserializer = new StaticDeserializerBuilder(new StaticAOTContext())
+        _deserializer = new StaticDeserializerBuilder(new StaticAotContext())
             .WithTypeConverter(new ParamsConverter())
             .IgnoreUnmatchedProperties()
             .Build();
@@ -30,7 +30,7 @@ public class YAMLParser : IMetadataParser
     {
         try
         {
-            return deserializer.Deserialize<T>(content);
+            return _deserializer.Deserialize<T>(content);
         }
         catch
         {
diff --git a/source/Program.cs b/source/Program.cs
index 4a5e3b4..4b32eee 100644
--- a/source/Program.cs
+++ b/source/Program.cs
@@ -19,7 +19,7 @@ public class Program(ILogger logger)
     /// <summary>
     /// Basic logo of the program, for fun
     /// </summary>
-    private static readonly string helloWorld = @"
+    private static readonly string HelloWorld = @"
 ░█▀▀░░░░░█▀▀░░░░░█▀▀
 ░▀▀█░█░█░█░░░█▀█░▀▀█
 ░▀▀▀░▀▀▀░▀▀▀░▀▀▀░▀▀▀";
@@ -144,6 +144,6 @@ public class Program(ILogger logger)
     /// </summary>
     public void OutputLogo()
     {
-        logger.Information(helloWorld);
+        logger.Information(HelloWorld);
     }
 }
diff --git a/source/ServerHandlers/HttpListenerResponseWrapper.cs b/source/ServerHandlers/HttpListenerResponseWrapper.cs
index 22485e7..4fd2480 100644
--- a/source/ServerHandlers/HttpListenerResponseWrapper.cs
+++ b/source/ServerHandlers/HttpListenerResponseWrapper.cs
@@ -11,22 +11,22 @@ namespace SuCoS.ServerHandlers;
 /// <param name="response"></param>
 public class HttpListenerResponseWrapper(HttpListenerResponse response) : IHttpListenerResponse
 {
-    private readonly HttpListenerResponse response = response;
+    private readonly HttpListenerResponse _response = response;
 
     /// <inheritdoc />
-    public Stream OutputStream => response.OutputStream;
+    public Stream OutputStream => _response.OutputStream;
 
     /// <inheritdoc />
     public string? ContentType
     {
-        get => response.ContentType;
-        set => response.ContentType = value;
+        get => _response.ContentType;
+        set => _response.ContentType = value;
     }
 
     /// <inheritdoc />
     public long ContentLength64
     {
-        get => response.ContentLength64;
-        set => response.ContentLength64 = value;
+        get => _response.ContentLength64;
+        set => _response.ContentLength64 = value;
     }
 }
diff --git a/source/ServerHandlers/RegisteredPageRequest.cs b/source/ServerHandlers/RegisteredPageRequest.cs
index 12e06c7..51fed83 100644
--- a/source/ServerHandlers/RegisteredPageRequest.cs
+++ b/source/ServerHandlers/RegisteredPageRequest.cs
@@ -8,7 +8,7 @@ namespace SuCoS.ServerHandlers;
 /// </summary>
 public class RegisteredPageRequest : IServerHandlers
 {
-    private readonly ISite site;
+    private readonly ISite _site;
 
     /// <summary>
     /// Constructor
@@ -16,7 +16,7 @@ public class RegisteredPageRequest : IServerHandlers
     /// <param name="site"></param>
     public RegisteredPageRequest(ISite site)
     {
-        this.site = site;
+        this._site = site;
     }
 
     /// <inheritdoc />
@@ -24,7 +24,7 @@ public class RegisteredPageRequest : IServerHandlers
     {
         ArgumentNullException.ThrowIfNull(requestPath);
 
-        return site.OutputReferences.TryGetValue(requestPath, out var item) && item is IPage _;
+        return _site.OutputReferences.TryGetValue(requestPath, out var item) && item is IPage _;
     }
 
     /// <inheritdoc />
@@ -32,7 +32,7 @@ public class RegisteredPageRequest : IServerHandlers
     {
         ArgumentNullException.ThrowIfNull(response);
 
-        if (site.OutputReferences.TryGetValue(requestPath, out var output) && output is IPage page)
+        if (_site.OutputReferences.TryGetValue(requestPath, out var output) && output is IPage page)
         {
             var content = page.CompleteContent;
             content = InjectReloadScript(content);
diff --git a/source/ServerHandlers/RegisteredPageResourceRequest.cs b/source/ServerHandlers/RegisteredPageResourceRequest.cs
index 4d117e3..40015f3 100644
--- a/source/ServerHandlers/RegisteredPageResourceRequest.cs
+++ b/source/ServerHandlers/RegisteredPageResourceRequest.cs
@@ -8,7 +8,7 @@ namespace SuCoS.ServerHandlers;
 /// </summary>
 public class RegisteredPageResourceRequest : IServerHandlers
 {
-    readonly ISite site;
+    readonly ISite _site;
 
     /// <summary>
     /// Constructor
@@ -16,7 +16,7 @@ public class RegisteredPageResourceRequest : IServerHandlers
     /// <param name="site"></param>
     public RegisteredPageResourceRequest(ISite site)
     {
-        this.site = site;
+        this._site = site;
     }
 
     /// <inheritdoc />
@@ -24,7 +24,7 @@ public class RegisteredPageResourceRequest : IServerHandlers
     {
         ArgumentNullException.ThrowIfNull(requestPath);
 
-        return site.OutputReferences.TryGetValue(requestPath, out var item) && item is IResource _;
+        return _site.OutputReferences.TryGetValue(requestPath, out var item) && item is IResource _;
     }
 
     /// <inheritdoc />
@@ -32,7 +32,7 @@ public class RegisteredPageResourceRequest : IServerHandlers
     {
         ArgumentNullException.ThrowIfNull(response);
 
-        if (site.OutputReferences.TryGetValue(requestPath, out var output) && output is IResource resource)
+        if (_site.OutputReferences.TryGetValue(requestPath, out var output) && output is IResource resource)
         {
             response.ContentType = resource.MimeType;
             await using var fileStream = new FileStream(resource.SourceFullPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
diff --git a/source/ServerHandlers/StaticFileRequest.cs b/source/ServerHandlers/StaticFileRequest.cs
index 6703a15..546f6fd 100644
--- a/source/ServerHandlers/StaticFileRequest.cs
+++ b/source/ServerHandlers/StaticFileRequest.cs
@@ -7,8 +7,8 @@ namespace SuCoS.ServerHandlers;
 /// </summary>
 public class StaticFileRequest : IServerHandlers
 {
-    private readonly string? basePath;
-    private readonly bool inTheme;
+    private readonly string? _basePath;
+    private readonly bool _inTheme;
 
     /// <summary>
     /// Constructor
@@ -17,8 +17,8 @@ public class StaticFileRequest : IServerHandlers
     /// <param name="inTheme"></param>
     public StaticFileRequest(string? basePath, bool inTheme)
     {
-        this.basePath = basePath;
-        this.inTheme = inTheme;
+        this._basePath = basePath;
+        this._inTheme = inTheme;
     }
 
     /// <inheritdoc />
@@ -26,12 +26,12 @@ public class StaticFileRequest : IServerHandlers
     {
         ArgumentNullException.ThrowIfNull(requestPath);
 
-        if (string.IsNullOrEmpty(basePath))
+        if (string.IsNullOrEmpty(_basePath))
         {
             return false;
         }
 
-        var fileAbsolutePath = Path.Combine(basePath, requestPath.TrimStart('/'));
+        var fileAbsolutePath = Path.Combine(_basePath, requestPath.TrimStart('/'));
         return File.Exists(fileAbsolutePath);
     }
 
@@ -41,12 +41,12 @@ public class StaticFileRequest : IServerHandlers
         ArgumentNullException.ThrowIfNull(requestPath);
         ArgumentNullException.ThrowIfNull(response);
 
-        var fileAbsolutePath = Path.Combine(basePath!, requestPath.TrimStart('/'));
+        var fileAbsolutePath = Path.Combine(_basePath!, requestPath.TrimStart('/'));
         response.ContentType = GetContentType(fileAbsolutePath!);
         await using var fileStream = new FileStream(fileAbsolutePath!, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
         response.ContentLength64 = fileStream.Length;
         await fileStream.CopyToAsync(response.OutputStream).ConfigureAwait(false);
-        return inTheme ? "themeSt" : "static";
+        return _inTheme ? "themeSt" : "static";
     }
 
     /// <summary>
diff --git a/test/Commands/BaseGeneratorCommandTests.cs b/test/Commands/BaseGeneratorCommandTests.cs
index ecfd6d2..e52486f 100644
--- a/test/Commands/BaseGeneratorCommandTests.cs
+++ b/test/Commands/BaseGeneratorCommandTests.cs
@@ -10,33 +10,33 @@ namespace Tests.Commands;
 
 public class BaseGeneratorCommandTests
 {
-    private static readonly IGenerateOptions testOptions = new GenerateOptions
+    private static readonly IGenerateOptions TestOptions = new GenerateOptions
     {
         SourceArgument = "test_source"
     };
 
-    private static readonly ILogger testLogger = new LoggerConfiguration().CreateLogger();
+    private static readonly ILogger TestLogger = new LoggerConfiguration().CreateLogger();
 
     private class BaseGeneratorCommandStub(IGenerateOptions options, ILogger logger, IFileSystem fs)
         : BaseGeneratorCommand(options, logger, fs);
 
-    readonly IFileSystem fs;
+    readonly IFileSystem _fs;
 
     public BaseGeneratorCommandTests()
     {
-        fs = Substitute.For<IFileSystem>();
+        _fs = Substitute.For<IFileSystem>();
     }
 
     [Fact]
     public void Constructor_ShouldThrowArgumentNullException_WhenOptionsIsNull()
     {
-        _ = Assert.Throws<ArgumentNullException>(() => new BaseGeneratorCommandStub(null!, testLogger, fs));
+        _ = Assert.Throws<ArgumentNullException>(() => new BaseGeneratorCommandStub(null!, TestLogger, _fs));
     }
 
     [Fact]
     public void Constructor_ShouldThrowArgumentNullException_WhenLoggerIsNull()
     {
-        _ = Assert.Throws<ArgumentNullException>(() => new BaseGeneratorCommandStub(testOptions, null!, fs));
+        _ = Assert.Throws<ArgumentNullException>(() => new BaseGeneratorCommandStub(TestOptions, null!, _fs));
     }
 
     [Fact]
diff --git a/test/Commands/BuildCommandTests.cs b/test/Commands/BuildCommandTests.cs
index eb1aef0..3f184ad 100644
--- a/test/Commands/BuildCommandTests.cs
+++ b/test/Commands/BuildCommandTests.cs
@@ -8,26 +8,26 @@ namespace Tests.Commands;
 
 public class BuildCommandTests
 {
-    readonly ILogger logger;
-    readonly IFileSystem fileSystem;
-    readonly BuildOptions options;
+    readonly ILogger _logger;
+    readonly IFileSystem _fileSystem;
+    readonly BuildOptions _options;
 
     public BuildCommandTests()
     {
-        logger = Substitute.For<ILogger>();
-        fileSystem = Substitute.For<IFileSystem>();
-        fileSystem.FileExists("./sucos.yaml").Returns(true);
-        fileSystem.FileReadAllText("./sucos.yaml").Returns("""
+        _logger = Substitute.For<ILogger>();
+        _fileSystem = Substitute.For<IFileSystem>();
+        _fileSystem.FileExists("./sucos.yaml").Returns(true);
+        _fileSystem.FileReadAllText("./sucos.yaml").Returns("""
 Ttile: test
 """);
-        options = new BuildOptions { Output = "test" };
+        _options = new BuildOptions { Output = "test" };
     }
 
     [Fact]
     public void Constructor_ShouldNotThrowException_WhenParametersAreValid()
     {
         // Act
-        var result = new BuildCommand(options, logger, fileSystem);
+        var result = new BuildCommand(_options, _logger, _fileSystem);
 
         // Assert
         Assert.IsType<BuildCommand>(result);
@@ -37,14 +37,14 @@ Ttile: test
     public void Constructor_ShouldThrowArgumentNullException_WhenOptionsIsNull()
     {
         // Act and Assert
-        Assert.Throws<ArgumentNullException>(() => new BuildCommand(null!, logger, fileSystem));
+        Assert.Throws<ArgumentNullException>(() => new BuildCommand(null!, _logger, _fileSystem));
     }
 
     [Fact]
     public void Run()
     {
         // Act
-        var command = new BuildCommand(options, logger, fileSystem);
+        var command = new BuildCommand(_options, _logger, _fileSystem);
         var result = command.Run();
 
         // Assert
@@ -95,27 +95,27 @@ Ttile: test
     public void CopyFolder_ShouldCallCreateDirectory_WhenSourceFolderExists()
     {
         // Arrange
-        fileSystem.DirectoryExists("sourceFolder").Returns(true);
-        var buildCommand = new BuildCommand(options, logger, fileSystem);
+        _fileSystem.DirectoryExists("sourceFolder").Returns(true);
+        var buildCommand = new BuildCommand(_options, _logger, _fileSystem);
 
         // Act
         buildCommand.CopyFolder("sourceFolder", "outputFolder");
 
         // Assert
-        fileSystem.Received(1).DirectoryCreateDirectory("outputFolder");
+        _fileSystem.Received(1).DirectoryCreateDirectory("outputFolder");
     }
 
     [Fact]
     public void CopyFolder_ShouldNotCallCreateDirectory_WhenSourceFolderDoesNotExist()
     {
         // Arrange
-        fileSystem.DirectoryExists("sourceFolder").Returns(false);
-        var buildCommand = new BuildCommand(options, logger, fileSystem);
+        _fileSystem.DirectoryExists("sourceFolder").Returns(false);
+        var buildCommand = new BuildCommand(_options, _logger, _fileSystem);
 
         // Act
         buildCommand.CopyFolder("sourceFolder", "outputFolder");
 
         // Assert
-        fileSystem.DidNotReceive().DirectoryCreateDirectory(Arg.Any<string>());
+        _fileSystem.DidNotReceive().DirectoryCreateDirectory(Arg.Any<string>());
     }
 }
diff --git a/test/Commands/NewSiteCommandTests.cs b/test/Commands/NewSiteCommandTests.cs
index cbb44dd..77abedd 100644
--- a/test/Commands/NewSiteCommandTests.cs
+++ b/test/Commands/NewSiteCommandTests.cs
@@ -9,25 +9,25 @@ namespace Tests.Commands;
 
 public class NewSiteCommandTests
 {
-    readonly ILogger logger;
-    readonly IFileSystem fileSystem;
-    readonly ISite site;
+    readonly ILogger _logger;
+    readonly IFileSystem _fileSystem;
+    readonly ISite _site;
 
     public NewSiteCommandTests()
     {
-        logger = Substitute.For<ILogger>();
-        fileSystem = Substitute.For<IFileSystem>();
-        site = Substitute.For<ISite>();
+        _logger = Substitute.For<ILogger>();
+        _fileSystem = Substitute.For<IFileSystem>();
+        _site = Substitute.For<ISite>();
     }
 
     [Fact]
     public void Create_ShouldReturnNewSiteCommand_WhenParametersAreValid()
     {
         // Arrange
-        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseURL = "http://test.com" };
+        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "http://test.com" };
 
         // Act
-        var result = NewSiteCommand.Create(options, logger, fileSystem);
+        var result = NewSiteCommand.Create(options, _logger, _fileSystem);
 
         // Assert
         Assert.IsType<NewSiteCommand>(result);
@@ -37,17 +37,17 @@ public class NewSiteCommandTests
     public void Create_ShouldThrowArgumentNullException_WhenOptionsIsNull()
     {
         // Act and Assert
-        Assert.Throws<ArgumentNullException>(testCode: () => NewSiteCommand.Create(null!, logger, fileSystem));
+        Assert.Throws<ArgumentNullException>(testCode: () => NewSiteCommand.Create(null!, _logger, _fileSystem));
     }
 
     [Fact]
     public void Create_ShouldNotReturnNull_WhenParametersAreValid()
     {
         // Arrange
-        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseURL = "http://test.com" };
+        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "http://test.com" };
 
         // Act
-        var result = NewSiteCommand.Create(options, logger, fileSystem);
+        var result = NewSiteCommand.Create(options, _logger, _fileSystem);
 
         // Assert
         Assert.NotNull(result);
@@ -57,47 +57,47 @@ public class NewSiteCommandTests
     public void Run_ShouldLogInformation_WhenCreatingNewSite()
     {
         // Arrange
-        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseURL = "http://test.com", Force = false };
-        fileSystem.FileExists(Arg.Any<string>()).Returns(false);
+        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "http://test.com", Force = false };
+        _fileSystem.FileExists(Arg.Any<string>()).Returns(false);
 
-        var newSiteCommand = NewSiteCommand.Create(options, logger, fileSystem);
+        var newSiteCommand = NewSiteCommand.Create(options, _logger, _fileSystem);
 
         // Act
         newSiteCommand.Run();
 
         // Assert
-        logger.Received(1).Information("Creating a new site: {title} at {outputPath}", options.Title, Arg.Any<string>());
+        _logger.Received(1).Information("Creating a new site: {title} at {outputPath}", options.Title, Arg.Any<string>());
     }
 
     [Fact]
     public void Run_ShouldCallCreateDirectoryWithCorrectPaths_ForEachFolder()
     {
         // Arrange
-        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseURL = "http://test.com", Force = false };
-        site.SourceFolders.Returns(["folder1", "folder2"]);
-        fileSystem.FileExists(Arg.Any<string>()).Returns(false);
+        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "http://test.com", Force = false };
+        _site.SourceFolders.Returns(["folder1", "folder2"]);
+        _fileSystem.FileExists(Arg.Any<string>()).Returns(false);
 
-        var newSiteCommand = new NewSiteCommand(options, logger, fileSystem, site);
+        var newSiteCommand = new NewSiteCommand(options, _logger, _fileSystem, _site);
 
         // Act
         newSiteCommand.Run();
 
         // Assert
-        fileSystem.Received(1).DirectoryCreateDirectory("folder1");
-        fileSystem.Received(1).DirectoryCreateDirectory("folder2");
+        _fileSystem.Received(1).DirectoryCreateDirectory("folder1");
+        _fileSystem.Received(1).DirectoryCreateDirectory("folder2");
     }
 
     [Fact]
     public void Run_ShouldReturn1_WhenCreateDirectoryThrowsException()
     {
         // Arrange
-        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseURL = "http://test.com", Force = false };
-        site.SourceFolders.Returns(["folder1", "folder2"]);
-        fileSystem.FileExists(Arg.Any<string>()).Returns(false);
-        fileSystem.When(x => x.DirectoryCreateDirectory(Arg.Any<string>()))
+        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "http://test.com", Force = false };
+        _site.SourceFolders.Returns(["folder1", "folder2"]);
+        _fileSystem.FileExists(Arg.Any<string>()).Returns(false);
+        _fileSystem.When(x => x.DirectoryCreateDirectory(Arg.Any<string>()))
             .Do(x => { throw new ArgumentNullException(); });
 
-        var newSiteCommand = new NewSiteCommand(options, logger, fileSystem, site);
+        var newSiteCommand = new NewSiteCommand(options, _logger, _fileSystem, _site);
 
         // Act
         var result = newSiteCommand.Run();
@@ -111,9 +111,9 @@ public class NewSiteCommandTests
     {
         // Arrange
         var options = new NewSiteOptions { Output = "test", Force = false };
-        fileSystem.FileExists(Arg.Any<string>()).Returns(false);
+        _fileSystem.FileExists(Arg.Any<string>()).Returns(false);
 
-        var newSiteCommand = new NewSiteCommand(options, logger, fileSystem, site);
+        var newSiteCommand = new NewSiteCommand(options, _logger, _fileSystem, _site);
 
         // Act
         var result = newSiteCommand.Run();
@@ -127,9 +127,9 @@ public class NewSiteCommandTests
     {
         // Arrange
         var options = new NewSiteOptions { Output = "test", Force = false };
-        fileSystem.FileExists(Arg.Any<string>()).Returns(true);
+        _fileSystem.FileExists(Arg.Any<string>()).Returns(true);
 
-        var newSiteCommand = new NewSiteCommand(options, logger, fileSystem, site);
+        var newSiteCommand = new NewSiteCommand(options, _logger, _fileSystem, _site);
 
         // Act
         var result = newSiteCommand.Run();
@@ -143,9 +143,9 @@ public class NewSiteCommandTests
     {
         // Arrange
         var options = new NewSiteOptions { Output = "test", Force = true };
-        fileSystem.FileExists(Arg.Any<string>()).Returns(true);
+        _fileSystem.FileExists(Arg.Any<string>()).Returns(true);
 
-        var newSiteCommand = new NewSiteCommand(options, logger, fileSystem, site);
+        var newSiteCommand = new NewSiteCommand(options, _logger, _fileSystem, _site);
 
         // Act
         var result = newSiteCommand.Run();
@@ -159,12 +159,12 @@ public class NewSiteCommandTests
     {
         // Arrange
         var options = new NewSiteOptions { Output = "test", Force = true };
-        fileSystem.FileExists(Arg.Any<string>()).Returns(false);
-        site.Parser
+        _fileSystem.FileExists(Arg.Any<string>()).Returns(false);
+        _site.Parser
             .When(x => x.Export(Arg.Any<SiteSettings>(), Arg.Any<string>()))
             .Do(x => { throw new ArgumentNullException(); });
 
-        var newSiteCommand = new NewSiteCommand(options, logger, fileSystem, site);
+        var newSiteCommand = new NewSiteCommand(options, _logger, _fileSystem, _site);
 
         // Act
         var result = newSiteCommand.Run();
@@ -178,15 +178,15 @@ public class NewSiteCommandTests
     {
         // Arrange
         var options = new NewSiteOptions { Output = "test", Force = false };
-        site.SourceFolders.Returns(["folder1", "folder2"]);
-        fileSystem.FileExists(Arg.Any<string>()).Returns(false);
+        _site.SourceFolders.Returns(["folder1", "folder2"]);
+        _fileSystem.FileExists(Arg.Any<string>()).Returns(false);
 
-        var newSiteCommand = new NewSiteCommand(options, logger, fileSystem, site);
+        var newSiteCommand = new NewSiteCommand(options, _logger, _fileSystem, _site);
 
         // Act
         newSiteCommand.Run();
 
         // Assert
-        fileSystem.Received(2).DirectoryCreateDirectory(Arg.Any<string>());
+        _fileSystem.Received(2).DirectoryCreateDirectory(Arg.Any<string>());
     }
 }
diff --git a/test/Helpers/StopwatchReporterTests.cs b/test/Helpers/StopwatchReporterTests.cs
index b2e67db..c5701b5 100644
--- a/test/Helpers/StopwatchReporterTests.cs
+++ b/test/Helpers/StopwatchReporterTests.cs
@@ -11,13 +11,13 @@ namespace Tests.Helpers;
 
 public class StopwatchReporterTests
 {
-    private readonly ILogger logger;
-    private readonly InMemorySink inMemorySink;
+    private readonly ILogger _logger;
+    private readonly InMemorySink _inMemorySink;
 
     public StopwatchReporterTests()
     {
-        inMemorySink = new InMemorySink();
-        logger = new LoggerConfiguration().WriteTo.Sink(inMemorySink).CreateLogger();
+        _inMemorySink = new InMemorySink();
+        _logger = new LoggerConfiguration().WriteTo.Sink(_inMemorySink).CreateLogger();
     }
 
     [Fact]
@@ -31,7 +31,7 @@ public class StopwatchReporterTests
         stopwatchReporter.Start(stepName);
 
         // Assert
-        var stopwatchField = stopwatchReporter.GetType().GetField("stopwatches", BindingFlags.NonPublic | BindingFlags.Instance);
+        var stopwatchField = stopwatchReporter.GetType().GetField("_stopwatches", BindingFlags.NonPublic | BindingFlags.Instance);
         Assert.NotNull(stopwatchField);
 
         var stopwatchDictionary = stopwatchField.GetValue(stopwatchReporter) as Dictionary<string, Stopwatch>;
@@ -48,7 +48,7 @@ public class StopwatchReporterTests
         var siteTitle = "TestSite";
         var duration = 123;
 
-        var stopwatchReporter = new StopwatchReporter(logger);
+        var stopwatchReporter = new StopwatchReporter(_logger);
         stopwatchReporter.Start(stepName);
         Thread.Sleep(duration); // Let's wait a bit to simulate some processing.
         stopwatchReporter.Stop(stepName, 1);
@@ -56,7 +56,7 @@ public class StopwatchReporterTests
         stopwatchReporter.LogReport(siteTitle);
 
         // Assert
-        var logEvents = inMemorySink.LogEvents;
+        var logEvents = _inMemorySink.LogEvents;
         Assert.NotEmpty(logEvents);
         var logMessage = logEvents.First().RenderMessage(CultureInfo.InvariantCulture);
         Assert.Contains($"Site '{siteTitle}' created!", logMessage, StringComparison.InvariantCulture);
@@ -68,7 +68,7 @@ public class StopwatchReporterTests
     public void Stop_ThrowsExceptionWhenStopCalledWithoutStart()
     {
         var stepName = "TestStep";
-        var stopwatchReporter = new StopwatchReporter(logger);
+        var stopwatchReporter = new StopwatchReporter(_logger);
 
         // Don't call Start for stepName
 
diff --git a/test/Models/FrontMatterTests.cs b/test/Models/FrontMatterTests.cs
index bb33cdd..c959a35 100644
--- a/test/Models/FrontMatterTests.cs
+++ b/test/Models/FrontMatterTests.cs
@@ -7,9 +7,9 @@ namespace Tests.Models;
 public class FrontMatterTests : TestSetup
 {
     [Theory]
-    [InlineData("Title1", "Section1", "Type1", "URL1", Kind.single)]
-    [InlineData("Title2", "Section2", "Type2", "URL2", Kind.list)]
-    [InlineData("Title3", "Section3", "Type3", "URL3", Kind.index)]
+    [InlineData("Title1", "Section1", "Type1", "URL1", Kind.Single)]
+    [InlineData("Title2", "Section2", "Type2", "URL2", Kind.List)]
+    [InlineData("Title3", "Section3", "Type3", "URL3", Kind.Index)]
     public void Constructor_Sets_Properties_Correctly(string title, string section, string type, string url, Kind kind)
     {
         // Act
@@ -18,7 +18,7 @@ public class FrontMatterTests : TestSetup
             Title = title,
             Section = section,
             Type = type,
-            URL = url,
+            Url = url,
             Kind = kind
         };
 
@@ -26,7 +26,7 @@ public class FrontMatterTests : TestSetup
         Assert.Equal(title, basicContent.Title);
         Assert.Equal(section, basicContent.Section);
         Assert.Equal(type, basicContent.Type);
-        Assert.Equal(url, basicContent.URL);
+        Assert.Equal(url, basicContent.Url);
         Assert.Equal(kind, basicContent.Kind);
     }
 
diff --git a/test/Models/PageTests.cs b/test/Models/PageTests.cs
index 8dbb6c8..104bc61 100644
--- a/test/Models/PageTests.cs
+++ b/test/Models/PageTests.cs
@@ -8,7 +8,7 @@ namespace Tests.Models;
 
 public class PageTests : TestSetup
 {
-    private const string markdown1CONST = @"
+    private const string Markdown1Const = @"
 # word01 word02
 
 word03 word04 word05 6 7 eight
@@ -18,16 +18,16 @@ word03 word04 word05 6 7 eight
 ```cs
 console.WriteLine('hello word')
 ```";
-    private const string markdown2CONST = @"
+    private const string Markdown2Const = @"
 # word01 word02
 
 word03 word04 word05 6 7 [eight](http://example.com)";
-    private const string markdownPlain1CONST = @"word01 word02
+    private const string MarkdownPlain1Const = @"word01 word02
 word03 word04 word05 6 7 eight
 nine
 console.WriteLine('hello word')
 ";
-    private const string markdownPlain2CONST = @"word01 word02
+    private const string MarkdownPlain2Const = @"word01 word02
 word03 word04 word05 6 7 eight
 ";
 
@@ -35,12 +35,12 @@ word03 word04 word05 6 7 eight
     [InlineData("Test Title", "/path/to/file.md", "file", "/path/to")]
     public void Frontmatter_ShouldCreateWithCorrectProperties(string title, string sourcePath, string sourceFileNameWithoutExtension, string sourcePathDirectory)
     {
-        var page = new Page(frontMatterMock, site);
+        var page = new Page(FrontMatterMock, Site);
 
         // Assert
         Assert.Equal(title, page.Title);
         Assert.Equal(sourcePath, page.SourceRelativePath);
-        Assert.Same(site, page.Site);
+        Assert.Same(Site, page.Site);
         Assert.Equal(sourceFileNameWithoutExtension, page.SourceFileNameWithoutExtension);
         Assert.Equal(sourcePathDirectory, page.SourceRelativePathDirectory);
     }
@@ -49,13 +49,13 @@ word03 word04 word05 6 7 eight
     public void Frontmatter_ShouldHaveDefaultValuesForOptionalProperties()
     {
         // Arrange
-        var page = new Page(frontMatterMock, site);
+        var page = new Page(FrontMatterMock, Site);
 
         // Assert
         Assert.Equal(string.Empty, page.Section);
-        Assert.Equal(Kind.single, page.Kind);
+        Assert.Equal(Kind.Single, page.Kind);
         Assert.Equal("page", page.Type);
-        Assert.Null(page.URL);
+        Assert.Null(page.Url);
         Assert.Empty(page.Params);
         Assert.Null(page.Date);
         Assert.Null(page.LastMod);
@@ -63,13 +63,13 @@ word03 word04 word05 6 7 eight
         Assert.Null(page.ExpiryDate);
         Assert.Null(page.AliasesProcessed);
         Assert.Null(page.Permalink);
-        Assert.Empty(page.AllOutputURLs);
+        Assert.Empty(page.AllOutputUrLs);
         Assert.Equal(string.Empty, page.RawContent);
         Assert.Empty(page.TagsReference);
         Assert.Empty(page.PagesReferences);
         Assert.Empty(page.RegularPages);
-        Assert.False(site.IsDateExpired(page));
-        Assert.True(site.IsDatePublishable(page));
+        Assert.False(Site.IsDateExpired(page));
+        Assert.True(Site.IsDatePublishable(page));
     }
 
     [Theory]
@@ -79,17 +79,17 @@ word03 word04 word05 6 7 eight
     {
         var page = new Page(new FrontMatter
         {
-            Title = titleCONST,
-            SourceRelativePath = sourcePathCONST,
+            Title = TitleConst,
+            SourceRelativePath = SourcePathConst,
             Aliases = new() { "v123", "{{ page.Title }}", "{{ page.Title }}-2" }
-        }, site);
+        }, Site);
 
         // Act
-        site.PostProcessPage(page);
+        Site.PostProcessPage(page);
 
         // Assert
-        Assert.Equal(3, site.OutputReferences.Count);
-        _ = site.OutputReferences.TryGetValue(url, out var pageOther);
+        Assert.Equal(3, Site.OutputReferences.Count);
+        _ = Site.OutputReferences.TryGetValue(url, out var pageOther);
         Assert.NotNull(pageOther);
         Assert.Same(page, pageOther);
     }
@@ -101,13 +101,13 @@ word03 word04 word05 6 7 eight
     {
         var page = new Page(new FrontMatter
         {
-            Title = titleCONST,
-            SourceRelativePath = sourcePathCONST,
-            ExpiryDate = systemClockMock.Now.AddDays(days)
-        }, site);
+            Title = TitleConst,
+            SourceRelativePath = SourcePathConst,
+            ExpiryDate = SystemClockMock.Now.AddDays(days)
+        }, Site);
 
         // Assert
-        Assert.Equal(expected, site.IsDateExpired(page));
+        Assert.Equal(expected, Site.IsDateExpired(page));
     }
 
     [Theory]
@@ -120,14 +120,14 @@ word03 word04 word05 6 7 eight
     {
         var page = new Page(new FrontMatter
         {
-            Title = titleCONST,
-            SourceRelativePath = sourcePathCONST,
+            Title = TitleConst,
+            SourceRelativePath = SourcePathConst,
             PublishDate = publishDate is null ? null : DateTime.Parse(publishDate, CultureInfo.InvariantCulture),
             Date = date is null ? null : DateTime.Parse(date, CultureInfo.InvariantCulture)
-        }, site);
+        }, Site);
 
         // Assert
-        Assert.Equal(expectedValue, site.IsDatePublishable(page));
+        Assert.Equal(expectedValue, Site.IsDatePublishable(page));
     }
 
     [Theory]
@@ -171,18 +171,18 @@ word03 word04 word05 6 7 eight
     {
         var page = new Page(new FrontMatter
         {
-            Title = titleCONST,
-            SourceRelativePath = sourcePathCONST,
+            Title = TitleConst,
+            SourceRelativePath = SourcePathConst,
             PublishDate = publishDate is null ? null : DateTime.Parse(publishDate, CultureInfo.InvariantCulture),
             Date = date is null ? null : DateTime.Parse(date, CultureInfo.InvariantCulture),
             Draft = draft
-        }, site);
+        }, Site);
 
         var options = Substitute.For<IGenerateOptions>();
         _ = options.Draft.Returns(draftOption);
 
         // Assert
-        Assert.Equal(expectedValue, site.IsValidPage(page, options));
+        Assert.Equal(expectedValue, Site.IsValidPage(page, options));
     }
 
     [Theory]
@@ -192,17 +192,17 @@ word03 word04 word05 6 7 eight
     {
         var page = new Page(new FrontMatter
         {
-            Title = titleCONST,
-            SourceRelativePath = sourcePathCONST,
-            Date = systemClockMock.Now.AddDays(1)
-        }, site);
+            Title = TitleConst,
+            SourceRelativePath = SourcePathConst,
+            Date = SystemClockMock.Now.AddDays(1)
+        }, Site);
 
         // Act
         var options = Substitute.For<IGenerateOptions>();
         _ = options.Future.Returns(futureOption);
 
         // Assert
-        Assert.Equal(expected, site.IsValidDate(page, options));
+        Assert.Equal(expected, Site.IsValidDate(page, options));
     }
 
     [Theory]
@@ -212,9 +212,9 @@ word03 word04 word05 6 7 eight
     {
         var page = new Page(new FrontMatter
         {
-            Title = titleCONST,
+            Title = TitleConst,
             SourceRelativePath = sourcePath
-        }, site);
+        }, Site);
 
         // Assert
         Assert.Equal(expectedUrl, page.CreatePermalink());
@@ -227,10 +227,10 @@ word03 word04 word05 6 7 eight
     {
         var page = new Page(new FrontMatter
         {
-            Title = titleCONST,
-            SourceRelativePath = sourcePathCONST,
-            URL = urlTemplate
-        }, site);
+            Title = TitleConst,
+            SourceRelativePath = SourcePathConst,
+            Url = urlTemplate
+        }, Site);
         var actualPermalink = page.CreatePermalink();
 
         // Assert
@@ -238,43 +238,43 @@ word03 word04 word05 6 7 eight
     }
 
     [Theory]
-    [InlineData(Kind.single, true)]
-    [InlineData(Kind.list, false)]
+    [InlineData(Kind.Single, true)]
+    [InlineData(Kind.List, false)]
     public void RegularPages_ShouldReturnCorrectPages_WhenKindIsSingle(Kind kind, bool isExpectedPage)
     {
-        var page = new Page(frontMatterMock, site) { Kind = kind };
+        var page = new Page(FrontMatterMock, Site) { Kind = kind };
 
         // Act
-        site.PostProcessPage(page);
+        Site.PostProcessPage(page);
 
         // Assert
-        Assert.Equal(isExpectedPage, site.RegularPages.Contains(page));
+        Assert.Equal(isExpectedPage, Site.RegularPages.Contains(page));
     }
 
     [Theory]
-    [InlineData(markdown1CONST, 13)]
-    [InlineData(markdown2CONST, 8)]
+    [InlineData(Markdown1Const, 13)]
+    [InlineData(Markdown2Const, 8)]
     public void WordCount_ShouldReturnCorrectCounts(string rawContent, int wordCountExpected)
     {
         var page = new Page(new FrontMatter
         {
             RawContent = rawContent
-        }, site);
+        }, Site);
 
         // Assert
         Assert.Equal(wordCountExpected, page.WordCount);
     }
 
     [Theory]
-    [InlineData(markdown1CONST, markdownPlain1CONST)]
-    [InlineData(markdown2CONST, markdownPlain2CONST)]
+    [InlineData(Markdown1Const, MarkdownPlain1Const)]
+    [InlineData(Markdown2Const, MarkdownPlain2Const)]
     public void Plain_ShouldReturnCorrectPlainString(string rawContent, string plain)
     {
         ArgumentException.ThrowIfNullOrEmpty(plain);
         var page = new Page(new FrontMatter
         {
             RawContent = rawContent
-        }, site);
+        }, Site);
         // Required to make the test pass on Windows
         plain = plain.Replace("\r\n", "\n", StringComparison.Ordinal);
 
diff --git a/test/Models/SiteTests.cs b/test/Models/SiteTests.cs
index 8b6532c..3e97f2f 100644
--- a/test/Models/SiteTests.cs
+++ b/test/Models/SiteTests.cs
@@ -11,11 +11,11 @@ namespace Tests.Models;
 /// </summary>
 public class SiteTests : TestSetup
 {
-    readonly IFileSystem fs;
+    readonly IFileSystem _fs;
 
     public SiteTests()
     {
-        fs = new FileSystem();
+        _fs = new FileSystem();
     }
 
     [Theory]
@@ -24,97 +24,97 @@ public class SiteTests : TestSetup
     public void ScanAllMarkdownFiles_ShouldCountainFilenames(string fileName)
     {
         var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileName);
-        var siteFullPath = Path.GetFullPath(Path.Combine(testSitesPath, testSitePathCONST01));
-        site.Options = new GenerateOptions
+        var siteFullPath = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst01));
+        Site.Options = new GenerateOptions
         {
             SourceArgument = siteFullPath
         };
 
         // Act
-        site.ParseAndScanSourceFiles(fs, Path.Combine(siteFullPath, "content"));
+        Site.ParseAndScanSourceFiles(_fs, Path.Combine(siteFullPath, "content"));
 
         // Assert
-        Assert.Contains(site.Pages, page => page.SourceRelativePathDirectory!.Length == 0);
-        Assert.Contains(site.Pages, page => page.SourceFileNameWithoutExtension == fileNameWithoutExtension);
+        Assert.Contains(Site.Pages, page => page.SourceRelativePathDirectory!.Length == 0);
+        Assert.Contains(Site.Pages, page => page.SourceFileNameWithoutExtension == fileNameWithoutExtension);
     }
 
     [Theory]
-    [InlineData(testSitePathCONST01)]
-    [InlineData(testSitePathCONST02)]
+    [InlineData(TestSitePathConst01)]
+    [InlineData(TestSitePathConst02)]
     public void Home_ShouldReturnAHomePage(string sitePath)
     {
         GenerateOptions options = new()
         {
-            SourceArgument = Path.GetFullPath(Path.Combine(testSitesPath, sitePath))
+            SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, sitePath))
         };
-        site.Options = options;
+        Site.Options = options;
 
         // Act
-        site.ParseAndScanSourceFiles(fs, site.SourceContentPath);
+        Site.ParseAndScanSourceFiles(_fs, Site.SourceContentPath);
 
         // Assert
-        Assert.NotNull(site.Home);
-        Assert.True(site.Home.IsHome);
-        _ = Assert.Single(site.OutputReferences.Values.Where(output => output is IPage page && page.IsHome));
+        Assert.NotNull(Site.Home);
+        Assert.True(Site.Home.IsHome);
+        _ = Assert.Single(Site.OutputReferences.Values.Where(output => output is IPage page && page.IsHome));
     }
 
     [Theory]
-    [InlineData(testSitePathCONST01, 0)]
-    [InlineData(testSitePathCONST02, 0)]
-    [InlineData(testSitePathCONST03, 1)]
+    [InlineData(TestSitePathConst01, 0)]
+    [InlineData(TestSitePathConst02, 0)]
+    [InlineData(TestSitePathConst03, 1)]
     public void Page_IsSection_ShouldReturnExpectedQuantityOfPages(string sitePath, int expectedQuantity)
     {
         GenerateOptions options = new()
         {
-            SourceArgument = Path.GetFullPath(Path.Combine(testSitesPath, sitePath))
+            SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, sitePath))
         };
-        site.Options = options;
+        Site.Options = options;
 
         // Act
-        site.ParseAndScanSourceFiles(fs, null);
+        Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        Assert.Equal(expectedQuantity, site.OutputReferences.Values.Where(output => output is IPage page && page.IsSection).Count());
+        Assert.Equal(expectedQuantity, Site.OutputReferences.Values.Where(output => output is IPage page && page.IsSection).Count());
     }
 
     [Theory]
-    [InlineData(testSitePathCONST01, 5)]
-    [InlineData(testSitePathCONST02, 1)]
-    [InlineData(testSitePathCONST03, 13)]
-    [InlineData(testSitePathCONST04, 26)]
+    [InlineData(TestSitePathConst01, 5)]
+    [InlineData(TestSitePathConst02, 1)]
+    [InlineData(TestSitePathConst03, 13)]
+    [InlineData(TestSitePathConst04, 26)]
     public void PagesReference_ShouldReturnExpectedQuantityOfPages(string sitePath, int expectedQuantity)
     {
         GenerateOptions options = new()
         {
-            SourceArgument = Path.GetFullPath(Path.Combine(testSitesPath, sitePath))
+            SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, sitePath))
         };
-        site.Options = options;
+        Site.Options = options;
 
         // Act
-        site.ParseAndScanSourceFiles(fs, null);
+        Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        Assert.Equal(expectedQuantity, site.OutputReferences.Values.Where(output => output is IPage page).Count());
+        Assert.Equal(expectedQuantity, Site.OutputReferences.Values.Where(output => output is IPage page).Count());
     }
 
     [Theory]
-    [InlineData(testSitePathCONST01, 4)]
-    [InlineData(testSitePathCONST02, 0)]
-    [InlineData(testSitePathCONST03, 11)]
-    [InlineData(testSitePathCONST04, 21)]
+    [InlineData(TestSitePathConst01, 4)]
+    [InlineData(TestSitePathConst02, 0)]
+    [InlineData(TestSitePathConst03, 11)]
+    [InlineData(TestSitePathConst04, 21)]
     public void Page_IsPage_ShouldReturnExpectedQuantityOfPages(string sitePath, int expectedQuantity)
     {
         GenerateOptions options = new()
         {
-            SourceArgument = Path.GetFullPath(Path.Combine(testSitesPath, sitePath))
+            SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, sitePath))
         };
-        site.Options = options;
+        Site.Options = options;
 
         // Act
-        site.ParseAndScanSourceFiles(fs, null);
+        Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        Assert.Equal(expectedQuantity, site.OutputReferences.Values.Where(output => output is IPage page && page.IsPage).Count());
+        Assert.Equal(expectedQuantity, Site.OutputReferences.Values.Where(output => output is IPage page && page.IsPage).Count());
     }
 
     [Fact]
@@ -122,16 +122,16 @@ public class SiteTests : TestSetup
     {
         GenerateOptions options = new()
         {
-            SourceArgument = Path.GetFullPath(Path.Combine(testSitesPath, testSitePathCONST03))
+            SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst03))
         };
-        site.Options = options;
+        Site.Options = options;
 
         // Act
-        site.ParseAndScanSourceFiles(fs, null);
+        Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        Assert.Equal(100, site.RegularPages.First().Weight);
-        Assert.Equal(-100, site.RegularPages.Last().Weight);
+        Assert.Equal(100, Site.RegularPages.First().Weight);
+        Assert.Equal(-100, Site.RegularPages.Last().Weight);
     }
 
     [Fact]
@@ -139,16 +139,16 @@ public class SiteTests : TestSetup
     {
         GenerateOptions options = new()
         {
-            SourceArgument = Path.GetFullPath(Path.Combine(testSitesPath, testSitePathCONST01))
+            SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst01))
         };
-        site.Options = options;
+        Site.Options = options;
 
         // Act
-        site.ParseAndScanSourceFiles(fs, null);
+        Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        Assert.Equal(0, site.RegularPages.First().Weight);
-        Assert.Equal(0, site.RegularPages.Last().Weight);
+        Assert.Equal(0, Site.RegularPages.First().Weight);
+        Assert.Equal(0, Site.RegularPages.Last().Weight);
     }
 
     [Fact]
@@ -156,15 +156,15 @@ public class SiteTests : TestSetup
     {
         GenerateOptions options = new()
         {
-            SourceArgument = Path.GetFullPath(Path.Combine(testSitesPath, testSitePathCONST04))
+            SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst04))
         };
-        site.Options = options;
+        Site.Options = options;
 
         // Act
-        site.ParseAndScanSourceFiles(fs, null);
+        Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        _ = site.OutputReferences.TryGetValue("/tags", out var output);
+        _ = Site.OutputReferences.TryGetValue("/tags", out var output);
         var tagSectionPage = output as IPage;
         Assert.NotNull(tagSectionPage);
         Assert.Equal(2, tagSectionPage.Pages.Count());
@@ -179,15 +179,15 @@ public class SiteTests : TestSetup
     {
         GenerateOptions options = new()
         {
-            SourceArgument = Path.GetFullPath(Path.Combine(testSitesPath, testSitePathCONST04))
+            SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst04))
         };
-        site.Options = options;
+        Site.Options = options;
 
         // Act
-        site.ParseAndScanSourceFiles(fs, null);
+        Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        _ = site.OutputReferences.TryGetValue("/tags/tag1", out var output);
+        _ = Site.OutputReferences.TryGetValue("/tags/tag1", out var output);
         var page = output as IPage;
         Assert.NotNull(page);
         Assert.Equal(10, page.Pages.Count());
@@ -204,15 +204,15 @@ public class SiteTests : TestSetup
     {
         GenerateOptions options = new()
         {
-            SourceArgument = Path.GetFullPath(Path.Combine(testSitesPath, testSitePathCONST04))
+            SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst04))
         };
-        site.Options = options;
+        Site.Options = options;
 
         // Act
-        site.ParseAndScanSourceFiles(fs, null);
+        Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        _ = site.OutputReferences.TryGetValue(url, out var output);
+        _ = Site.OutputReferences.TryGetValue(url, out var output);
         var page = output as IPage;
         Assert.NotNull(page);
         Assert.Equal(expectedContent, page.Content);
@@ -239,17 +239,17 @@ public class SiteTests : TestSetup
     {
         GenerateOptions options = new()
         {
-            SourceArgument = Path.GetFullPath(Path.Combine(testSitesPath, testSitePathCONST05))
+            SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst05))
         };
-        var parser = new SuCoS.Parser.YAMLParser();
-        var siteSettings = SiteHelper.ParseSettings("sucos.yaml", options, parser, fs);
-        site = new Site(options, siteSettings, parser, loggerMock, null);
+        var parser = new SuCoS.Parser.YamlParser();
+        var siteSettings = SiteHelper.ParseSettings("sucos.yaml", options, parser, _fs);
+        Site = new Site(options, siteSettings, parser, LoggerMock, null);
 
         // Act
-        site.ParseAndScanSourceFiles(fs, null);
+        Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        _ = site.OutputReferences.TryGetValue(url, out var output);
+        _ = Site.OutputReferences.TryGetValue(url, out var output);
         var page = output as IPage;
         Assert.NotNull(page);
         Assert.Equal(expectedContentPreRendered, page.ContentPreRendered);
@@ -267,17 +267,17 @@ public class SiteTests : TestSetup
     {
         GenerateOptions options = new()
         {
-            SourceArgument = Path.GetFullPath(Path.Combine(testSitesPath, testSitePathCONST07))
+            SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst07))
         };
-        var parser = new SuCoS.Parser.YAMLParser();
-        var siteSettings = SiteHelper.ParseSettings("sucos.yaml", options, parser, fs);
-        site = new Site(options, siteSettings, parser, loggerMock, null);
+        var parser = new SuCoS.Parser.YamlParser();
+        var siteSettings = SiteHelper.ParseSettings("sucos.yaml", options, parser, _fs);
+        Site = new Site(options, siteSettings, parser, LoggerMock, null);
 
         // Act
-        site.ParseAndScanSourceFiles(fs, null);
+        Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        _ = site.OutputReferences.TryGetValue(url, out var output);
+        _ = Site.OutputReferences.TryGetValue(url, out var output);
         var page = output as IPage;
         Assert.NotNull(page);
         Assert.Equal(string.Empty, page.Content);
@@ -309,17 +309,17 @@ public class SiteTests : TestSetup
     {
         GenerateOptions options = new()
         {
-            SourceArgument = Path.GetFullPath(Path.Combine(testSitesPath, testSitePathCONST06))
+            SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst06))
         };
-        var parser = new SuCoS.Parser.YAMLParser();
-        var siteSettings = SiteHelper.ParseSettings("sucos.yaml", options, parser, fs);
-        site = new Site(options, siteSettings, parser, loggerMock, null);
+        var parser = new SuCoS.Parser.YamlParser();
+        var siteSettings = SiteHelper.ParseSettings("sucos.yaml", options, parser, _fs);
+        Site = new Site(options, siteSettings, parser, LoggerMock, null);
 
         // Act
-        site.ParseAndScanSourceFiles(fs, null);
+        Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        _ = site.OutputReferences.TryGetValue(url, out var output);
+        _ = Site.OutputReferences.TryGetValue(url, out var output);
         var page = output as IPage;
         Assert.NotNull(page);
         Assert.Equal(expectedContentPreRendered, page.ContentPreRendered);
diff --git a/test/Parser/YAMLParserTests.cs b/test/Parser/YAMLParserTests.cs
index 2b24f24..15accb8 100644
--- a/test/Parser/YAMLParserTests.cs
+++ b/test/Parser/YAMLParserTests.cs
@@ -5,11 +5,11 @@ using Xunit;
 
 namespace Tests.YAMLParser;
 
-public class YAMLParserTests : TestSetup
+public class YamlParserTests : TestSetup
 {
-    private readonly SuCoS.Parser.YAMLParser parser;
+    private readonly SuCoS.Parser.YamlParser _parser;
 
-    private const string pageFrontmaterCONST = @"Title: Test Title
+    private const string PageFrontmaterConst = @"Title: Test Title
 Type: post
 Date: 2023-07-01
 LastMod: 2023-06-01
@@ -33,12 +33,12 @@ Params:
       - Test
       - Real Data
 ";
-    private const string pageMarkdownCONST = @"
+    private const string PageMarkdownConst = @"
 # Real Data Test
 
 This is a test using real data. Real Data Test
 ";
-    private const string siteContentCONST = @"
+    private const string SiteContentConst = @"
 Title: My Site
 BaseURL: https://www.example.com/
 Description: Tastiest C# Static Site Generator of the World
@@ -55,17 +55,17 @@ Params:
       - Test
       - Real Data
 ";
-    private const string fileFullPathCONST = "test.md";
-    private const string fileRelativePathCONST = "test.md";
-    private readonly string pageContent;
+    private const string FileFullPathConst = "test.md";
+    private const string FileRelativePathConst = "test.md";
+    private readonly string _pageContent;
 
-    public YAMLParserTests()
+    public YamlParserTests()
     {
-        parser = new SuCoS.Parser.YAMLParser();
-        pageContent = @$"---
-{pageFrontmaterCONST}
+        _parser = new SuCoS.Parser.YamlParser();
+        _pageContent = @$"---
+{PageFrontmaterConst}
 ---
-{pageMarkdownCONST}";
+{PageMarkdownConst}";
     }
 
     [Fact]
@@ -93,7 +93,7 @@ Date: 2023-04-01
     public void ParseFrontmatter_ShouldParseTitleCorrectly(string fileContent, string expectedTitle)
     {
         // Arrange
-        var frontMatter = FrontMatter.Parse(fileRelativePathCONST, fileFullPathCONST, parser, fileContent);
+        var frontMatter = FrontMatter.Parse(FileRelativePathConst, FileFullPathConst, _parser, fileContent);
 
         // Assert
         Assert.Equal(expectedTitle, frontMatter.Title);
@@ -114,7 +114,7 @@ Date: 2023/01/01
         var expectedDate = DateTime.Parse(expectedDateString, CultureInfo.InvariantCulture);
 
         // Act
-        var frontMatter = FrontMatter.Parse(fileRelativePathCONST, fileFullPathCONST, parser, fileContent);
+        var frontMatter = FrontMatter.Parse(FileRelativePathConst, FileFullPathConst, _parser, fileContent);
 
         // Assert
         Assert.Equal(expectedDate, frontMatter.Date);
@@ -130,7 +130,7 @@ Date: 2023/01/01
         var expectedExpiryDate = DateTime.Parse("2024-06-01", CultureInfo.InvariantCulture);
 
         // Act
-        var frontMatter = FrontMatter.Parse(fileRelativePathCONST, fileFullPathCONST, parser, pageContent);
+        var frontMatter = FrontMatter.Parse(FileRelativePathConst, FileFullPathConst, _parser, _pageContent);
 
         // Assert
         Assert.Equal("Test Title", frontMatter.Title);
@@ -152,19 +152,19 @@ Title
 
         // Assert
         Assert.Throws<FormatException>(() =>
-            FrontMatter.Parse(fileRelativePathCONST, fileFullPathCONST, parser, fileContent));
+            FrontMatter.Parse(FileRelativePathConst, FileFullPathConst, _parser, fileContent));
     }
 
     [Fact]
     public void ParseSiteSettings_ShouldReturnSiteWithCorrectSettings()
     {
         // Act
-        var siteSettings = parser.Parse<SiteSettings>(siteContentCONST);
+        var siteSettings = _parser.Parse<SiteSettings>(SiteContentConst);
 
 
         // Assert
         Assert.Equal("My Site", siteSettings.Title);
-        Assert.Equal("https://www.example.com/", siteSettings.BaseURL);
+        Assert.Equal("https://www.example.com/", siteSettings.BaseUrl);
         Assert.Equal("Tastiest C# Static Site Generator of the World", siteSettings.Description);
         Assert.Equal("Copyright message", siteSettings.Copyright);
     }
@@ -173,8 +173,8 @@ Title
     public void ParseParams_ShouldFillParamsWithNonMatchingFields()
     {
         // Arrange
-        var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, parser, pageContent);
-        var page = new Page(frontMatter, site);
+        var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, _parser, _pageContent);
+        var page = new Page(frontMatter, Site);
 
         // Assert
         Assert.False(page.Params.ContainsKey("customParam"));
@@ -186,11 +186,11 @@ Title
     {
         // Arrange
         var date = DateTime.Parse("2023-07-01", CultureInfo.InvariantCulture);
-        var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, parser, pageContent);
-        Page page = new(frontMatter, site);
+        var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, _parser, _pageContent);
+        Page page = new(frontMatter, Site);
 
         // Act
-        site.PostProcessPage(page);
+        Site.PostProcessPage(page);
 
         // Assert
         Assert.Equal(date, frontMatter.Date);
@@ -200,11 +200,11 @@ Title
     public void ParseFrontmatter_ShouldCreateTags()
     {
         // Arrange
-        var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, parser, pageContent);
-        Page page = new(frontMatter, site);
+        var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, _parser, _pageContent);
+        Page page = new(frontMatter, Site);
 
         // Act
-        site.PostProcessPage(page);
+        Site.PostProcessPage(page);
 
         // Assert
         Assert.Equal(2, page.TagsReference.Count);
@@ -213,57 +213,57 @@ Title
     [Fact]
     public void FrontMatterParse_RawContentNull()
     {
-        _ = Assert.Throws<FormatException>(() => FrontMatter.Parse("invalidFrontmatter", "", "fakePath", "fakePath", frontMatterParser));
+        _ = Assert.Throws<FormatException>(() => FrontMatter.Parse("invalidFrontmatter", "", "fakePath", "fakePath", FrontMatterParser));
     }
 
     [Fact]
     public void ParseYAML_ShouldThrowExceptionWhenFrontmatterIsInvalid()
     {
-        _ = Assert.Throws<FormatException>(() => parser.Parse<FrontMatter>("invalidFrontmatter"));
+        _ = Assert.Throws<FormatException>(() => _parser.Parse<FrontMatter>("invalidFrontmatter"));
     }
 
     [Fact]
     public void ParseYAML_ShouldSplitTheMetadata()
     {
         // Act
-        var (metadata, rawContent) = parser.SplitFrontMatter(pageContent);
+        var (metadata, rawContent) = _parser.SplitFrontMatter(_pageContent);
 
         // Assert
-        Assert.Equal(pageFrontmaterCONST.TrimEnd(), metadata);
-        Assert.Equal(pageMarkdownCONST, rawContent);
+        Assert.Equal(PageFrontmaterConst.TrimEnd(), metadata);
+        Assert.Equal(PageMarkdownConst, rawContent);
     }
 
     [Fact]
     public void ParseSiteSettings_ShouldReturnSiteSettings()
     {
         // Arrange
-        var siteSettings = parser.Parse<SiteSettings>(siteContentCONST);
+        var siteSettings = _parser.Parse<SiteSettings>(SiteContentConst);
 
         // Assert
         Assert.NotNull(siteSettings);
         Assert.Equal("My Site", siteSettings.Title);
-        Assert.Equal("https://www.example.com/", siteSettings.BaseURL);
+        Assert.Equal("https://www.example.com/", siteSettings.BaseUrl);
     }
 
 
     [Fact]
     public void SiteParams_ShouldHandleEmptyContent()
     {
-        Assert.Empty(site.Params);
+        Assert.Empty(Site.Params);
     }
 
     [Fact]
     public void SiteParams_ShouldPopulateParamsWithExtraFields()
     {
         // Arrange
-        var siteSettings = parser.Parse<SiteSettings>(siteContentCONST);
-        site = new Site(generateOptionsMock, siteSettings, frontMatterParser, loggerMock, systemClockMock);
+        var siteSettings = _parser.Parse<SiteSettings>(SiteContentConst);
+        Site = new Site(GenerateOptionsMock, siteSettings, FrontMatterParser, LoggerMock, SystemClockMock);
 
         // Assert
         Assert.NotEmpty(siteSettings.Params);
-        Assert.DoesNotContain("customParam", site.Params);
-        Assert.Contains("ParamsCustomParam", site.Params);
-        Assert.Equal("Custom Value", site.Params["ParamsCustomParam"]);
+        Assert.DoesNotContain("customParam", Site.Params);
+        Assert.Contains("ParamsCustomParam", Site.Params);
+        Assert.Equal("Custom Value", Site.Params["ParamsCustomParam"]);
         Assert.Equal(new[] { "Test", "Real Data" }, ((Dictionary<string, object>)siteSettings.Params["ParamsNestedData"])["Level2"]);
         Assert.Equal("Test", ((siteSettings.Params["ParamsNestedData"] as Dictionary<string, object>)?["Level2"] as List<object>)?[0]);
     }
diff --git a/test/ServerHandlers/PingRequestHandlerTests.cs b/test/ServerHandlers/PingRequestHandlerTests.cs
index d707d69..a254fbb 100644
--- a/test/ServerHandlers/PingRequestHandlerTests.cs
+++ b/test/ServerHandlers/PingRequestHandlerTests.cs
@@ -17,14 +17,14 @@ public class PingRequestHandlerTests : TestSetup
         var pingRequests = new PingRequests();
 
         // Act
-        var code = await pingRequests.Handle(response, "ping", todayDate).ConfigureAwait(true);
+        var code = await pingRequests.Handle(response, "ping", TodayDate).ConfigureAwait(true);
 
         // Assert
         _ = stream.Seek(0, SeekOrigin.Begin);
         using var reader = new StreamReader(stream);
         var content = await reader.ReadToEndAsync().ConfigureAwait(true);
 
-        Assert.Equal(todayDate.ToString("o"), content);
+        Assert.Equal(TodayDate.ToString("o"), content);
 
         Assert.Equal("ping", code);
     }
diff --git a/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs b/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs
index 89925db..eb5c8a0 100644
--- a/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs
+++ b/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs
@@ -10,11 +10,11 @@ namespace Tests.ServerHandlers;
 
 public class RegisteredPageRequestHandlerTests : TestSetup
 {
-    readonly IFileSystem fs;
+    readonly IFileSystem _fs;
 
     public RegisteredPageRequestHandlerTests()
     {
-        fs = new FileSystem();
+        _fs = new FileSystem();
     }
 
     [Theory]
@@ -23,43 +23,43 @@ public class RegisteredPageRequestHandlerTests : TestSetup
     public void Check_ReturnsTrueForRegisteredPage(string requestPath, bool exist)
     {
         // Arrange
-        var siteFullPath = Path.GetFullPath(Path.Combine(testSitesPath, testSitePathCONST06));
-        site.Options = new GenerateOptions
+        var siteFullPath = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst06));
+        Site.Options = new GenerateOptions
         {
             SourceArgument = siteFullPath
         };
-        var registeredPageRequest = new RegisteredPageRequest(site);
+        var registeredPageRequest = new RegisteredPageRequest(Site);
 
         // Act
-        site.ParseAndScanSourceFiles(fs, Path.Combine(siteFullPath, "content"));
+        Site.ParseAndScanSourceFiles(_fs, Path.Combine(siteFullPath, "content"));
 
         // Assert
         Assert.Equal(exist, registeredPageRequest.Check(requestPath));
     }
 
     [Theory]
-    [InlineData("/", testSitePathCONST06, false)]
-    [InlineData("/", testSitePathCONST08, true)]
+    [InlineData("/", TestSitePathConst06, false)]
+    [InlineData("/", TestSitePathConst08, true)]
     public async Task Handle_ReturnsExpectedContent2(string requestPath, string testSitePath, bool contains)
     {
         // Arrange
-        var siteFullPath = Path.GetFullPath(Path.Combine(testSitesPath, testSitePath));
+        var siteFullPath = Path.GetFullPath(Path.Combine(TestSitesPath, testSitePath));
         GenerateOptions options = new()
         {
             SourceArgument = siteFullPath
         };
-        var parser = new SuCoS.Parser.YAMLParser();
-        var siteSettings = SiteHelper.ParseSettings("sucos.yaml", options, parser, fs);
-        site = new Site(options, siteSettings, parser, loggerMock, null);
+        var parser = new SuCoS.Parser.YamlParser();
+        var siteSettings = SiteHelper.ParseSettings("sucos.yaml", options, parser, _fs);
+        Site = new Site(options, siteSettings, parser, LoggerMock, null);
 
-        var registeredPageRequest = new RegisteredPageRequest(site);
+        var registeredPageRequest = new RegisteredPageRequest(Site);
 
         var response = Substitute.For<IHttpListenerResponse>();
         var stream = new MemoryStream();
         _ = response.OutputStream.Returns(stream);
 
         // Act
-        site.ParseAndScanSourceFiles(fs, Path.Combine(siteFullPath, "content"));
+        Site.ParseAndScanSourceFiles(_fs, Path.Combine(siteFullPath, "content"));
         _ = registeredPageRequest.Check(requestPath);
         var code = await registeredPageRequest.Handle(response, requestPath, DateTime.Now).ConfigureAwait(true);
 
diff --git a/test/ServerHandlers/StaticFileRequestHandlerTests.cs b/test/ServerHandlers/StaticFileRequestHandlerTests.cs
index 88a58a3..1a0fd3a 100644
--- a/test/ServerHandlers/StaticFileRequestHandlerTests.cs
+++ b/test/ServerHandlers/StaticFileRequestHandlerTests.cs
@@ -6,21 +6,21 @@ namespace Tests.ServerHandlers;
 
 public class StaticFileRequestHandlerTests : TestSetup, IDisposable
 {
-    private readonly string tempFilePath;
+    private readonly string _tempFilePath;
 
     public StaticFileRequestHandlerTests()
     {
         // Creating a temporary file for testing purposes
-        tempFilePath = Path.GetTempFileName();
-        File.WriteAllText(tempFilePath, "test");
+        _tempFilePath = Path.GetTempFileName();
+        File.WriteAllText(_tempFilePath, "test");
     }
 
     [Fact]
     public void Check_ReturnsTrueForExistingFile()
     {
         // Arrange
-        var requestPath = Path.GetFileName(tempFilePath);
-        var basePath = Path.GetDirectoryName(tempFilePath)
+        var requestPath = Path.GetFileName(_tempFilePath);
+        var basePath = Path.GetDirectoryName(_tempFilePath)
             ?? throw new InvalidOperationException("Unable to determine directory of temporary file.");
 
         var staticFileRequest = new StaticFileRequest(basePath, false);
@@ -36,8 +36,8 @@ public class StaticFileRequestHandlerTests : TestSetup, IDisposable
     public async Task Handle_ReturnsExpectedContent()
     {
         // Arrange
-        var requestPath = Path.GetFileName(tempFilePath);
-        var basePath = Path.GetDirectoryName(tempFilePath)
+        var requestPath = Path.GetFileName(_tempFilePath);
+        var basePath = Path.GetDirectoryName(_tempFilePath)
             ?? throw new InvalidOperationException("Unable to determine directory of temporary file.");
         var staticFileRequest = new StaticFileRequest(basePath, true);
 
@@ -63,9 +63,9 @@ public class StaticFileRequestHandlerTests : TestSetup, IDisposable
     public void Dispose()
     {
         // Cleaning up the temporary file after tests run
-        if (File.Exists(tempFilePath))
+        if (File.Exists(_tempFilePath))
         {
-            File.Delete(tempFilePath);
+            File.Delete(_tempFilePath);
         }
 
         GC.SuppressFinalize(this);
diff --git a/test/TestSetup.cs b/test/TestSetup.cs
index c43fa1d..0699e39 100644
--- a/test/TestSetup.cs
+++ b/test/TestSetup.cs
@@ -9,46 +9,46 @@ namespace Tests;
 
 public class TestSetup
 {
-    protected const string titleCONST = "Test Title";
-    protected const string sourcePathCONST = "/path/to/file.md";
-    protected readonly DateTime todayDate = DateTime.Parse("2023-04-01", CultureInfo.InvariantCulture);
-    protected readonly DateTime futureDate = DateTime.Parse("2023-07-01", CultureInfo.InvariantCulture);
-
-    protected const string testSitePathCONST01 = ".TestSites/01";
-    protected const string testSitePathCONST02 = ".TestSites/02-have-index";
-    protected const string testSitePathCONST03 = ".TestSites/03-section";
-    protected const string testSitePathCONST04 = ".TestSites/04-tags";
-    protected const string testSitePathCONST05 = ".TestSites/05-theme-no-baseof";
-    protected const string testSitePathCONST06 = ".TestSites/06-theme";
-    protected const string testSitePathCONST07 = ".TestSites/07-theme-no-baseof-error";
-    protected const string testSitePathCONST08 = ".TestSites/08-theme-html";
-
-    protected readonly IMetadataParser frontMatterParser = new SuCoS.Parser.YAMLParser();
-    protected readonly IGenerateOptions generateOptionsMock = Substitute.For<IGenerateOptions>();
-    protected readonly SiteSettings siteSettingsMock = Substitute.For<SiteSettings>();
-    protected readonly ILogger loggerMock = Substitute.For<ILogger>();
-    protected readonly ISystemClock systemClockMock = Substitute.For<ISystemClock>();
-    protected readonly IFrontMatter frontMatterMock = new FrontMatter()
+    protected const string TitleConst = "Test Title";
+    protected const string SourcePathConst = "/path/to/file.md";
+    protected readonly DateTime TodayDate = DateTime.Parse("2023-04-01", CultureInfo.InvariantCulture);
+    protected readonly DateTime FutureDate = DateTime.Parse("2023-07-01", CultureInfo.InvariantCulture);
+
+    protected const string TestSitePathConst01 = ".TestSites/01";
+    protected const string TestSitePathConst02 = ".TestSites/02-have-index";
+    protected const string TestSitePathConst03 = ".TestSites/03-section";
+    protected const string TestSitePathConst04 = ".TestSites/04-tags";
+    protected const string TestSitePathConst05 = ".TestSites/05-theme-no-baseof";
+    protected const string TestSitePathConst06 = ".TestSites/06-theme";
+    protected const string TestSitePathConst07 = ".TestSites/07-theme-no-baseof-error";
+    protected const string TestSitePathConst08 = ".TestSites/08-theme-html";
+
+    protected readonly IMetadataParser FrontMatterParser = new SuCoS.Parser.YamlParser();
+    protected readonly IGenerateOptions GenerateOptionsMock = Substitute.For<IGenerateOptions>();
+    protected readonly SiteSettings SiteSettingsMock = Substitute.For<SiteSettings>();
+    protected readonly ILogger LoggerMock = Substitute.For<ILogger>();
+    protected readonly ISystemClock SystemClockMock = Substitute.For<ISystemClock>();
+    protected readonly IFrontMatter FrontMatterMock = new FrontMatter()
     {
-        Title = titleCONST,
-        SourceRelativePath = sourcePathCONST
+        Title = TitleConst,
+        SourceRelativePath = SourcePathConst
     };
 
-    protected ISite site;
+    protected ISite Site;
 
     // based on the compiled test.dll path
     // that is typically "bin/Debug/netX.0/test.dll"
-    protected const string testSitesPath = "../../..";
+    protected const string TestSitesPath = "../../..";
 
     public TestSetup()
     {
-        _ = systemClockMock.Now.Returns(todayDate);
-        site = new Site(generateOptionsMock, siteSettingsMock, frontMatterParser, loggerMock, systemClockMock);
+        _ = SystemClockMock.Now.Returns(TodayDate);
+        Site = new Site(GenerateOptionsMock, SiteSettingsMock, FrontMatterParser, LoggerMock, SystemClockMock);
     }
 
     public TestSetup(SiteSettings siteSettings)
     {
-        _ = systemClockMock.Now.Returns(todayDate);
-        site = new Site(generateOptionsMock, siteSettings, frontMatterParser, loggerMock, systemClockMock);
+        _ = SystemClockMock.Now.Returns(TodayDate);
+        Site = new Site(GenerateOptionsMock, siteSettings, FrontMatterParser, LoggerMock, SystemClockMock);
     }
 }
-- 
GitLab


From cd2fd96ba7e1cd83c2ff9e780e4bae48543534d8 Mon Sep 17 00:00:00 2001
From: Bruno Massa <brmassa@gmail.com>
Date: Sat, 27 Apr 2024 06:17:32 -0500
Subject: [PATCH 2/8] refactor: revert some major renaming of private fields

---
 .nuke/_nuke.csproj.DotSettings    |  5 ++++-
 source/Commands/BuildCommand.cs   |  2 +-
 source/Commands/NewSiteCommand.cs |  2 +-
 source/Models/FrontMatter.cs      |  4 ++--
 source/Models/IFrontMatter.cs     | 10 +++++-----
 source/Models/IPage.cs            |  2 +-
 source/Models/ISiteSettings.cs    |  4 ++--
 source/Models/Kind.cs             |  6 +++---
 source/Models/Page.cs             | 12 ++++++------
 source/Models/Site.cs             | 14 +++++++-------
 source/Models/SiteSettings.cs     |  4 ++--
 test/Models/FrontMatterTests.cs   | 10 +++++-----
 test/Models/PageTests.cs          | 10 +++++-----
 test/Parser/YAMLParserTests.cs    |  4 ++--
 14 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/.nuke/_nuke.csproj.DotSettings b/.nuke/_nuke.csproj.DotSettings
index 7bc2848..337271d 100644
--- a/.nuke/_nuke.csproj.DotSettings
+++ b/.nuke/_nuke.csproj.DotSettings
@@ -16,6 +16,8 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -24,4 +26,5 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/source/Commands/BuildCommand.cs b/source/Commands/BuildCommand.cs
index 11f0f04..06d1e6f 100644
--- a/source/Commands/BuildCommand.cs
+++ b/source/Commands/BuildCommand.cs
@@ -60,7 +60,7 @@ public class BuildCommand : BaseGeneratorCommand
 
             if (output is IPage page)
             {
-                var path = (url + (Site.UglyUrLs ? string.Empty : "/index.html")).TrimStart('/');
+                var path = (url + (Site.UglyURLs ? string.Empty : "/index.html")).TrimStart('/');
 
                 // Generate the output path
                 var outputAbsolutePath = Path.Combine(_options.Output, path);
diff --git a/source/Commands/NewSiteCommand.cs b/source/Commands/NewSiteCommand.cs
index 90d3ef5..25ab8ce 100644
--- a/source/Commands/NewSiteCommand.cs
+++ b/source/Commands/NewSiteCommand.cs
@@ -27,7 +27,7 @@ public sealed partial class NewSiteCommand(NewSiteOptions options, ILogger logge
         {
             Title = options.Title,
             Description = options.Description,
-            BaseUrl = options.BaseUrl
+            BaseURL = options.BaseUrl
         };
 
         var site = new Site(new GenerateOptions() { SourceOption = options.Output }, _siteSettings, new YamlParser(), null!, null);
diff --git a/source/Models/FrontMatter.cs b/source/Models/FrontMatter.cs
index 236d9ca..2895bd8 100644
--- a/source/Models/FrontMatter.cs
+++ b/source/Models/FrontMatter.cs
@@ -21,7 +21,7 @@ public class FrontMatter : IFrontMatter
     public string? Type { get; set; } = "page";
 
     /// <inheritdoc/>
-    public string? Url { get; set; }
+    public string? URL { get; set; }
 
     /// <inheritdoc/>
     public bool? Draft { get; set; }
@@ -59,7 +59,7 @@ public class FrontMatter : IFrontMatter
 
     /// <inheritdoc/>
     [YamlIgnore]
-    public Kind Kind { get; set; } = Kind.Single;
+    public Kind Kind { get; set; } = Kind.single;
 
     /// <inheritdoc/>
     [YamlIgnore]
diff --git a/source/Models/IFrontMatter.cs b/source/Models/IFrontMatter.cs
index d060591..b9c60d5 100644
--- a/source/Models/IFrontMatter.cs
+++ b/source/Models/IFrontMatter.cs
@@ -15,9 +15,9 @@ public interface IFrontMatter : IParams, IFile
     /// <summary>
     /// The first directory where the content is located, inside content.
     /// </summary>
-    /// 
+    ///
     /// <example>
-    /// If the content is located at <c>content/blog/2021-01-01-Hello-World.md</c>, 
+    /// If the content is located at <c>content/blog/2021-01-01-Hello-World.md</c>,
     /// then the value of this property will be <c>blog</c>.
     /// </example>
     string? Section { get; }
@@ -44,10 +44,10 @@ public interface IFrontMatter : IParams, IFile
     /// </code>
     /// will try to convert <code>page.Parent.Title</code> and <code>page.Title</code>.
     /// </example>
-    string? Url { get; }
+    string? URL { get; }
 
     /// <summary>
-    /// True for draft content. It will not be rendered unless 
+    /// True for draft content. It will not be rendered unless
     /// a option <see cref="IGenerateOptions.Draft"/> is set to <c>true</c>.
     /// </summary>
     bool? Draft { get; }
@@ -81,7 +81,7 @@ public interface IFrontMatter : IParams, IFile
     /// A List of secondary URL patterns to be used to create the url.
     /// List URL, it will be parsed as liquid templates, so you can use page variables.
     /// </summary>
-    /// <see cref="Url"/>
+    /// <see cref="URL"/>
     List<string>? Aliases { get; }
 
     /// <summary>
diff --git a/source/Models/IPage.cs b/source/Models/IPage.cs
index 0937c7f..9b80342 100644
--- a/source/Models/IPage.cs
+++ b/source/Models/IPage.cs
@@ -75,7 +75,7 @@ public interface IPage : IFrontMatter, IOutput
     /// <summary>
     /// Just a simple check if the current page is a "page"
     /// </summary>
-    public bool IsPage => Kind == Kind.Single;
+    public bool IsPage => Kind == Kind.single;
 
     /// <summary>
     /// The number of words in the main content
diff --git a/source/Models/ISiteSettings.cs b/source/Models/ISiteSettings.cs
index 8dd2248..2bbda14 100644
--- a/source/Models/ISiteSettings.cs
+++ b/source/Models/ISiteSettings.cs
@@ -23,10 +23,10 @@ public interface ISiteSettings : IParams
     /// <summary>
     /// The base URL that will be used to build public links.
     /// </summary>
-    public string BaseUrl { get; }
+    public string BaseURL { get; }
 
     /// <summary>
     /// The appearance of a URL is either ugly or pretty.
     /// </summary>
-    public bool UglyUrLs { get; }
+    public bool UglyURLs { get; }
 }
diff --git a/source/Models/Kind.cs b/source/Models/Kind.cs
index 99625fc..799009f 100644
--- a/source/Models/Kind.cs
+++ b/source/Models/Kind.cs
@@ -8,15 +8,15 @@ public enum Kind
     /// <summary>
     /// A single content page.
     /// </summary>
-    Single,
+    single,
 
     /// <summary>
     /// List of contents
     /// </summary>
-    List,
+    list,
 
     /// <summary>
     /// Special page, like the home page. It will be rendered as index.html.
     /// </summary>
-    Index
+    index
 }
diff --git a/source/Models/Page.cs b/source/Models/Page.cs
index a9cc141..e71774d 100644
--- a/source/Models/Page.cs
+++ b/source/Models/Page.cs
@@ -22,7 +22,7 @@ public class Page : IPage
     public string? Type => _frontMatter.Type;
 
     /// <inheritdoc/>
-    public string? Url => _frontMatter.Url;
+    public string? URL => _frontMatter.URL;
 
     /// <inheritdoc/>
     public bool? Draft => _frontMatter.Draft;
@@ -150,7 +150,7 @@ public class Page : IPage
     /// <summary>
     /// Just a simple check if the current page is a "page"
     /// </summary>
-    public bool IsPage => Kind == Kind.Single;
+    public bool IsPage => Kind == Kind.single;
 
     /// <summary>
     /// The number of words in the main content
@@ -216,7 +216,7 @@ public class Page : IPage
         get
         {
             _regularPagesCache ??= Pages
-                    .Where(page => page.Kind == Kind.Single)
+                    .Where(page => page.Kind == Kind.single)
                     .ToList();
             return _regularPagesCache;
         }
@@ -273,7 +273,7 @@ public class Page : IPage
     /// </summary>
     private string? ContentCache { get; set; }
 
-    private const string UrlForIndex = @"{%- liquid 
+    private const string UrlForIndex = @"{%- liquid
 if page.Parent
 echo page.Parent.Permalink
 echo '/'
@@ -284,7 +284,7 @@ else
 echo page.SourcePathLastDirectory
 endif
 -%}";
-    private const string UrlForNonIndex = @"{%- liquid 
+    private const string UrlForNonIndex = @"{%- liquid
 if page.Parent
 echo page.Parent.Permalink
 echo '/'
@@ -322,7 +322,7 @@ endif
 
         var permaLink = string.Empty;
 
-        urLforce ??= Url ?? (isIndex ? UrlForIndex : UrlForNonIndex);
+        urLforce ??= URL ?? (isIndex ? UrlForIndex : UrlForNonIndex);
 
         try
         {
diff --git a/source/Models/Site.cs b/source/Models/Site.cs
index b3a610d..792920e 100644
--- a/source/Models/Site.cs
+++ b/source/Models/Site.cs
@@ -40,10 +40,10 @@ public class Site : ISite
     public string? Copyright => _settings.Copyright;
 
     /// <inheritdoc/>
-    public string BaseUrl => _settings.BaseUrl;
+    public string BaseURL => _settings.BaseURL;
 
     /// <inheritdoc/>
-    public bool UglyUrLs => _settings.UglyUrLs;
+    public bool UglyURLs => _settings.UglyURLs;
 
     #endregion SiteSettings
 
@@ -224,16 +224,16 @@ public class Site : ISite
         relativePath = Urlizer.Path(relativePath);
         FrontMatter frontMatter = new()
         {
-            Kind = isIndex ? Kind.Index : Kind.List,
+            Kind = isIndex ? Kind.index : Kind.list,
             Section = isIndex ? "index" : sectionName,
             SourceRelativePath = Urlizer.Path(Path.Combine(relativePath, IndexLeafFileConst)),
             SourceFullPath = Urlizer.Path(Path.Combine(SourceContentPath, relativePath, IndexLeafFileConst)),
             Title = title,
             Type = isIndex ? "index" : sectionName,
-            Url = relativePath
+            URL = relativePath
         };
 
-        var id = frontMatter.Url;
+        var id = frontMatter.URL;
 
         // Get or create the page
         var lazyPage = CacheManager.AutomaticContentCache.GetOrAdd(id, new Lazy<IPage>(() =>
@@ -262,7 +262,7 @@ public class Site : ISite
             return page;
         }
 
-        if (page.Kind != Kind.Index)
+        if (page.Kind != Kind.index)
         {
             page.PagesReferences.Add(originalPage.Permalink);
         }
@@ -304,7 +304,7 @@ public class Site : ISite
             {
                 _ = OutputReferences.TryRemove(page!.Permalink!, out _);
                 page.Permalink = "/";
-                page.Kind = Kind.Index;
+                page.Kind = Kind.index;
 
                 _ = OutputReferences.GetOrAdd(page.Permalink, page);
                 Home = page;
diff --git a/source/Models/SiteSettings.cs b/source/Models/SiteSettings.cs
index af28478..e24f897 100644
--- a/source/Models/SiteSettings.cs
+++ b/source/Models/SiteSettings.cs
@@ -23,7 +23,7 @@ public class SiteSettings : ISiteSettings
 
 
     /// <inheritdoc/>
-    public string BaseUrl { get; set; } = string.Empty;
+    public string BaseURL { get; set; } = string.Empty;
 
     /// <inheritdoc/>
     public Dictionary<string, List<string>> Outputs { get; set; } = [];
@@ -43,7 +43,7 @@ public class SiteSettings : ISiteSettings
     /// <summary>
     /// The appearance of a URL is either ugly or pretty.
     /// </summary>
-    public bool UglyUrLs { get; set; }
+    public bool UglyURLs { get; set; }
 
     #region IParams
 
diff --git a/test/Models/FrontMatterTests.cs b/test/Models/FrontMatterTests.cs
index c959a35..bb33cdd 100644
--- a/test/Models/FrontMatterTests.cs
+++ b/test/Models/FrontMatterTests.cs
@@ -7,9 +7,9 @@ namespace Tests.Models;
 public class FrontMatterTests : TestSetup
 {
     [Theory]
-    [InlineData("Title1", "Section1", "Type1", "URL1", Kind.Single)]
-    [InlineData("Title2", "Section2", "Type2", "URL2", Kind.List)]
-    [InlineData("Title3", "Section3", "Type3", "URL3", Kind.Index)]
+    [InlineData("Title1", "Section1", "Type1", "URL1", Kind.single)]
+    [InlineData("Title2", "Section2", "Type2", "URL2", Kind.list)]
+    [InlineData("Title3", "Section3", "Type3", "URL3", Kind.index)]
     public void Constructor_Sets_Properties_Correctly(string title, string section, string type, string url, Kind kind)
     {
         // Act
@@ -18,7 +18,7 @@ public class FrontMatterTests : TestSetup
             Title = title,
             Section = section,
             Type = type,
-            Url = url,
+            URL = url,
             Kind = kind
         };
 
@@ -26,7 +26,7 @@ public class FrontMatterTests : TestSetup
         Assert.Equal(title, basicContent.Title);
         Assert.Equal(section, basicContent.Section);
         Assert.Equal(type, basicContent.Type);
-        Assert.Equal(url, basicContent.Url);
+        Assert.Equal(url, basicContent.URL);
         Assert.Equal(kind, basicContent.Kind);
     }
 
diff --git a/test/Models/PageTests.cs b/test/Models/PageTests.cs
index 104bc61..86c5d82 100644
--- a/test/Models/PageTests.cs
+++ b/test/Models/PageTests.cs
@@ -53,9 +53,9 @@ word03 word04 word05 6 7 eight
 
         // Assert
         Assert.Equal(string.Empty, page.Section);
-        Assert.Equal(Kind.Single, page.Kind);
+        Assert.Equal(Kind.single, page.Kind);
         Assert.Equal("page", page.Type);
-        Assert.Null(page.Url);
+        Assert.Null(page.URL);
         Assert.Empty(page.Params);
         Assert.Null(page.Date);
         Assert.Null(page.LastMod);
@@ -229,7 +229,7 @@ word03 word04 word05 6 7 eight
         {
             Title = TitleConst,
             SourceRelativePath = SourcePathConst,
-            Url = urlTemplate
+            URL = urlTemplate
         }, Site);
         var actualPermalink = page.CreatePermalink();
 
@@ -238,8 +238,8 @@ word03 word04 word05 6 7 eight
     }
 
     [Theory]
-    [InlineData(Kind.Single, true)]
-    [InlineData(Kind.List, false)]
+    [InlineData(Kind.single, true)]
+    [InlineData(Kind.list, false)]
     public void RegularPages_ShouldReturnCorrectPages_WhenKindIsSingle(Kind kind, bool isExpectedPage)
     {
         var page = new Page(FrontMatterMock, Site) { Kind = kind };
diff --git a/test/Parser/YAMLParserTests.cs b/test/Parser/YAMLParserTests.cs
index 15accb8..bc74c19 100644
--- a/test/Parser/YAMLParserTests.cs
+++ b/test/Parser/YAMLParserTests.cs
@@ -164,7 +164,7 @@ Title
 
         // Assert
         Assert.Equal("My Site", siteSettings.Title);
-        Assert.Equal("https://www.example.com/", siteSettings.BaseUrl);
+        Assert.Equal("https://www.example.com/", siteSettings.BaseURL);
         Assert.Equal("Tastiest C# Static Site Generator of the World", siteSettings.Description);
         Assert.Equal("Copyright message", siteSettings.Copyright);
     }
@@ -242,7 +242,7 @@ Title
         // Assert
         Assert.NotNull(siteSettings);
         Assert.Equal("My Site", siteSettings.Title);
-        Assert.Equal("https://www.example.com/", siteSettings.BaseUrl);
+        Assert.Equal("https://www.example.com/", siteSettings.BaseURL);
     }
 
 
-- 
GitLab


From 2ad13b0c4c4c15b7a32c58bc04f55556f986e79d Mon Sep 17 00:00:00 2001
From: Bruno Massa <brmassa@gmail.com>
Date: Tue, 7 May 2024 12:06:29 -0500
Subject: [PATCH 3/8] fix: Qodana/Rider fix suggestions

---
 .nuke/Build.Container.cs                          |  2 +-
 source/Commands/BaseGeneratorCommand.cs           |  4 ++--
 source/Commands/BuildCommand.cs                   |  3 ++-
 source/Commands/CheckLinkCommand.cs               |  4 ++--
 source/Commands/NewSiteCommand.cs                 |  5 +++--
 source/Commands/NewThemeCommand.cs                |  4 ++--
 source/Commands/ServeCommand.cs                   |  4 ++--
 source/Helpers/FileUtils.cs                       |  8 ++++----
 source/Helpers/IFileSystem.cs                     |  2 +-
 source/Helpers/SiteHelper.cs                      |  5 ++---
 .../Models/CommandLineOptions/NewSiteOptions.cs   |  2 +-
 .../Models/CommandLineOptions/NewThemeOptions.cs  |  2 +-
 source/Models/FrontMatter.cs                      |  5 ++---
 source/Models/IFrontMatter.cs                     |  6 +++---
 source/Models/IPage.cs                            |  2 +-
 source/Models/IResource.cs                        |  8 ++++++--
 source/Models/ISite.cs                            |  2 +-
 source/Models/Kind.cs                             |  6 +++---
 source/Models/Page.cs                             | 11 ++++++++---
 source/Models/Site.cs                             | 15 +++++++--------
 source/Parsers/IMetadataParser.cs                 |  4 +---
 source/Parsers/ParamsConverter.cs                 |  2 +-
 source/Parsers/StaticContext.cs                   |  2 +-
 source/Parsers/YAMLParser.cs                      |  2 +-
 source/Program.cs                                 |  3 ++-
 .../RegisteredPageResourceRequest.cs              |  2 +-
 source/ServerHandlers/StaticFileRequest.cs        |  4 ++--
 source/TemplateEngine/FluidTemplateEngine.cs      |  4 ++--
 source/TemplateEngine/ITemplateEngine.cs          |  2 +-
 test/Commands/BaseGeneratorCommandTests.cs        |  4 +++-
 test/Commands/BuildCommandTests.cs                |  8 +++++---
 test/Commands/NewSiteCommandTests.cs              |  8 +++++---
 test/Models/FrontMatterTests.cs                   |  6 +++---
 test/Models/PageTests.cs                          |  6 +++---
 test/Models/SiteTests.cs                          | 11 ++++++-----
 test/Parser/YAMLParserTests.cs                    |  5 +++--
 .../RegisteredPageRequestHandlerTests.cs          |  5 +++--
 test/TestSetup.cs                                 |  4 ++--
 38 files changed, 99 insertions(+), 83 deletions(-)

diff --git a/.nuke/Build.Container.cs b/.nuke/Build.Container.cs
index c52ab84..7a9db5b 100644
--- a/.nuke/Build.Container.cs
+++ b/.nuke/Build.Container.cs
@@ -70,7 +70,7 @@ sealed partial class Build : NukeBuild
         _ => throw new ArgumentException($"There is no container image for: {runtimeIdentifier}"),
     };
 
-    private List<string> ContainerTags()
+    List<string> ContainerTags()
     {
         if (IsLocalBuild)
         {
diff --git a/source/Commands/BaseGeneratorCommand.cs b/source/Commands/BaseGeneratorCommand.cs
index 93ae90a..7ffc7df 100644
--- a/source/Commands/BaseGeneratorCommand.cs
+++ b/source/Commands/BaseGeneratorCommand.cs
@@ -2,9 +2,9 @@ using Serilog;
 using SuCoS.Helpers;
 using SuCoS.Models;
 using SuCoS.Models.CommandLineOptions;
-using SuCoS.Parser;
+using SuCoS.Parsers;
 
-namespace SuCoS;
+namespace SuCoS.Commands;
 
 /// <summary>
 /// Base class for build and serve commands.
diff --git a/source/Commands/BuildCommand.cs b/source/Commands/BuildCommand.cs
index 06d1e6f..440a063 100644
--- a/source/Commands/BuildCommand.cs
+++ b/source/Commands/BuildCommand.cs
@@ -1,8 +1,9 @@
 using Serilog;
+using SuCoS.Helpers;
 using SuCoS.Models;
 using SuCoS.Models.CommandLineOptions;
 
-namespace SuCoS;
+namespace SuCoS.Commands;
 
 /// <summary>
 /// Build Command will build the site based on the source files.
diff --git a/source/Commands/CheckLinkCommand.cs b/source/Commands/CheckLinkCommand.cs
index 6440351..81788b5 100644
--- a/source/Commands/CheckLinkCommand.cs
+++ b/source/Commands/CheckLinkCommand.cs
@@ -5,7 +5,7 @@ using System.Text.RegularExpressions;
 using Serilog;
 using SuCoS.Models.CommandLineOptions;
 
-namespace SuCoS;
+namespace SuCoS.Commands;
 
 /// <summary>
 /// Check links of a given site.
@@ -68,7 +68,7 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
 
     private async Task<bool> CheckLinks(string directoryPath, string[] files, HttpClient httpClient)
     {
-        var filesCount = files.Length;
+        // var filesCount = files.Length;
         var result = true;
 
         var options = new ParallelOptions { MaxDegreeOfParallelism = Environment.ProcessorCount };
diff --git a/source/Commands/NewSiteCommand.cs b/source/Commands/NewSiteCommand.cs
index 25ab8ce..d19e68b 100644
--- a/source/Commands/NewSiteCommand.cs
+++ b/source/Commands/NewSiteCommand.cs
@@ -1,9 +1,10 @@
 using Serilog;
+using SuCoS.Helpers;
 using SuCoS.Models;
 using SuCoS.Models.CommandLineOptions;
-using SuCoS.Parser;
+using SuCoS.Parsers;
 
-namespace SuCoS;
+namespace SuCoS.Commands;
 
 /// <summary>
 /// Check links of a given site.
diff --git a/source/Commands/NewThemeCommand.cs b/source/Commands/NewThemeCommand.cs
index 89fca1a..03965ad 100644
--- a/source/Commands/NewThemeCommand.cs
+++ b/source/Commands/NewThemeCommand.cs
@@ -1,9 +1,9 @@
 using Serilog;
 using SuCoS.Models;
 using SuCoS.Models.CommandLineOptions;
-using SuCoS.Parser;
+using SuCoS.Parsers;
 
-namespace SuCoS;
+namespace SuCoS.Commands;
 
 /// <summary>
 /// Check links of a given site.
diff --git a/source/Commands/ServeCommand.cs b/source/Commands/ServeCommand.cs
index 8d305a0..4909421 100644
--- a/source/Commands/ServeCommand.cs
+++ b/source/Commands/ServeCommand.cs
@@ -1,10 +1,10 @@
+using System.Net;
 using Serilog;
 using SuCoS.Helpers;
 using SuCoS.Models.CommandLineOptions;
 using SuCoS.ServerHandlers;
-using System.Net;
 
-namespace SuCoS;
+namespace SuCoS.Commands;
 
 /// <summary>
 /// Serve Command will live serve the site and watch any changes.
diff --git a/source/Helpers/FileUtils.cs b/source/Helpers/FileUtils.cs
index 00220b0..7d7e7df 100644
--- a/source/Helpers/FileUtils.cs
+++ b/source/Helpers/FileUtils.cs
@@ -72,11 +72,11 @@ public static class FileUtils
         ArgumentNullException.ThrowIfNull(page);
 
         // Generate the lookup order for template files based on the theme path, page section, type, and kind
-        var sections = page.Section is not null ? new[] { page.Section, string.Empty } : new[] { string.Empty };
+        string[] sections = page.Section is not null ? [page.Section, string.Empty] : [string.Empty];
         var types = new[] { page.Type, "_default" };
-        var kinds = isBaseTemplate
-            ? new[] { page.Kind + "-baseof", "baseof" }
-            : new[] { page.Kind.ToString() };
+        string[] kinds = isBaseTemplate
+            ? [page.Kind.ToString().ToLower(System.Globalization.CultureInfo.CurrentCulture) + "-baseof", "baseof"]
+            : [page.Kind.ToString().ToLower(System.Globalization.CultureInfo.CurrentCulture)];
 
         // for each section, each type and each kind
         return (from section in sections
diff --git a/source/Helpers/IFileSystem.cs b/source/Helpers/IFileSystem.cs
index 1100c90..d469a49 100644
--- a/source/Helpers/IFileSystem.cs
+++ b/source/Helpers/IFileSystem.cs
@@ -1,4 +1,4 @@
-namespace SuCoS;
+namespace SuCoS.Helpers;
 
 /// <summary>
 /// Interface for the System.File class
diff --git a/source/Helpers/SiteHelper.cs b/source/Helpers/SiteHelper.cs
index 6a16724..6120604 100644
--- a/source/Helpers/SiteHelper.cs
+++ b/source/Helpers/SiteHelper.cs
@@ -2,7 +2,7 @@ using Markdig;
 using Serilog;
 using SuCoS.Models;
 using SuCoS.Models.CommandLineOptions;
-using SuCoS.Parser;
+using SuCoS.Parsers;
 
 namespace SuCoS.Helpers;
 
@@ -28,8 +28,7 @@ public static class SiteHelper
         ArgumentNullException.ThrowIfNull(stopwatch);
         ArgumentNullException.ThrowIfNull(fs);
 
-        SiteSettings siteSettings;
-        siteSettings = ParseSettings(configFile, options, parser, fs);
+        var siteSettings = ParseSettings(configFile, options, parser, fs);
 
         var site = new Site(options, siteSettings, parser, logger, null);
 
diff --git a/source/Models/CommandLineOptions/NewSiteOptions.cs b/source/Models/CommandLineOptions/NewSiteOptions.cs
index 12c5a99..b8e53e4 100644
--- a/source/Models/CommandLineOptions/NewSiteOptions.cs
+++ b/source/Models/CommandLineOptions/NewSiteOptions.cs
@@ -5,7 +5,7 @@ namespace SuCoS.Models.CommandLineOptions;
 /// <summary>
 /// Command line options to generate a simple site from scratch.
 /// </summary>
-[Verb("new-site", false, HelpText = "Generate a simple site from scratch")]
+[Verb("new-site", HelpText = "Generate a simple site from scratch")]
 public class NewSiteOptions
 {
     /// <summary>
diff --git a/source/Models/CommandLineOptions/NewThemeOptions.cs b/source/Models/CommandLineOptions/NewThemeOptions.cs
index f512afe..33db805 100644
--- a/source/Models/CommandLineOptions/NewThemeOptions.cs
+++ b/source/Models/CommandLineOptions/NewThemeOptions.cs
@@ -5,7 +5,7 @@ namespace SuCoS.Models.CommandLineOptions;
 /// <summary>
 /// Command line options to generate a simple site from scratch.
 /// </summary>
-[Verb("new-theme", false, HelpText = "Generate a simple theme from scratch")]
+[Verb("new-theme", HelpText = "Generate a simple theme from scratch")]
 public class NewThemeOptions
 {
     /// <summary>
diff --git a/source/Models/FrontMatter.cs b/source/Models/FrontMatter.cs
index 2895bd8..f1bf337 100644
--- a/source/Models/FrontMatter.cs
+++ b/source/Models/FrontMatter.cs
@@ -1,6 +1,5 @@
-using Serilog;
 using SuCoS.Helpers;
-using SuCoS.Parser;
+using SuCoS.Parsers;
 using YamlDotNet.Serialization;
 
 namespace SuCoS.Models;
@@ -59,7 +58,7 @@ public class FrontMatter : IFrontMatter
 
     /// <inheritdoc/>
     [YamlIgnore]
-    public Kind Kind { get; set; } = Kind.single;
+    public Kind Kind { get; set; } = Kind.Single;
 
     /// <inheritdoc/>
     [YamlIgnore]
diff --git a/source/Models/IFrontMatter.cs b/source/Models/IFrontMatter.cs
index b9c60d5..b7761b8 100644
--- a/source/Models/IFrontMatter.cs
+++ b/source/Models/IFrontMatter.cs
@@ -23,7 +23,7 @@ public interface IFrontMatter : IParams, IFile
     string? Section { get; }
 
     /// <summary>
-    /// The type of content. It's the will be "page", if not specified.
+    /// The type of content. It will be "page", if not specified.
     /// </summary>
     string? Type { get; }
 
@@ -36,7 +36,7 @@ public interface IFrontMatter : IParams, IFile
     /// <code>
     /// URL: my-page
     /// </code>
-    /// will be converted to <code>/my-page</code>, independetly of the page title.
+    /// will be converted to <code>/my-page</code>, independently of the page title.
     /// </example>
     /// <example>
     /// <code>
@@ -48,7 +48,7 @@ public interface IFrontMatter : IParams, IFile
 
     /// <summary>
     /// True for draft content. It will not be rendered unless
-    /// a option <see cref="IGenerateOptions.Draft"/> is set to <c>true</c>.
+    /// an option <see cref="IGenerateOptions.Draft"/> is set to <c>true</c>.
     /// </summary>
     bool? Draft { get; }
 
diff --git a/source/Models/IPage.cs b/source/Models/IPage.cs
index 9b80342..0937c7f 100644
--- a/source/Models/IPage.cs
+++ b/source/Models/IPage.cs
@@ -75,7 +75,7 @@ public interface IPage : IFrontMatter, IOutput
     /// <summary>
     /// Just a simple check if the current page is a "page"
     /// </summary>
-    public bool IsPage => Kind == Kind.single;
+    public bool IsPage => Kind == Kind.Single;
 
     /// <summary>
     /// The number of words in the main content
diff --git a/source/Models/IResource.cs b/source/Models/IResource.cs
index 003191f..e8ad67c 100644
--- a/source/Models/IResource.cs
+++ b/source/Models/IResource.cs
@@ -5,9 +5,13 @@ namespace SuCoS.Models;
 /// </summary>
 public interface IResource : IFile, IOutput, IParams
 {
-    /// <inheritdoc/>
+    /// <summary>
+    /// Resource name.
+    /// </summary>
     public string? Title { get; set; }
 
-    /// <inheritdoc/>
+    /// <summary>
+    /// Resource file name.
+    /// </summary>
     public string? FileName { get; set; }
 }
diff --git a/source/Models/ISite.cs b/source/Models/ISite.cs
index 3c92051..4abc463 100644
--- a/source/Models/ISite.cs
+++ b/source/Models/ISite.cs
@@ -1,7 +1,7 @@
 using Serilog;
 using SuCoS.Helpers;
 using SuCoS.Models.CommandLineOptions;
-using SuCoS.Parser;
+using SuCoS.Parsers;
 using SuCoS.TemplateEngine;
 using System.Collections.Concurrent;
 
diff --git a/source/Models/Kind.cs b/source/Models/Kind.cs
index 799009f..99625fc 100644
--- a/source/Models/Kind.cs
+++ b/source/Models/Kind.cs
@@ -8,15 +8,15 @@ public enum Kind
     /// <summary>
     /// A single content page.
     /// </summary>
-    single,
+    Single,
 
     /// <summary>
     /// List of contents
     /// </summary>
-    list,
+    List,
 
     /// <summary>
     /// Special page, like the home page. It will be rendered as index.html.
     /// </summary>
-    index
+    Index
 }
diff --git a/source/Models/Page.cs b/source/Models/Page.cs
index e71774d..e37c52d 100644
--- a/source/Models/Page.cs
+++ b/source/Models/Page.cs
@@ -150,7 +150,7 @@ public class Page : IPage
     /// <summary>
     /// Just a simple check if the current page is a "page"
     /// </summary>
-    public bool IsPage => Kind == Kind.single;
+    public bool IsPage => Kind == Kind.Single;
 
     /// <summary>
     /// The number of words in the main content
@@ -216,7 +216,7 @@ public class Page : IPage
         get
         {
             _regularPagesCache ??= Pages
-                    .Where(page => page.Kind == Kind.single)
+                    .Where(page => page.Kind == Kind.Single)
                     .ToList();
             return _regularPagesCache;
         }
@@ -391,6 +391,11 @@ endif
             return;
         }
 
+        if (!Directory.Exists(SourceFullPathDirectory))
+        {
+            return;
+        }
+
         try
         {
             var resourceFiles = Directory.GetFiles(SourceFullPathDirectory)
@@ -424,7 +429,7 @@ endif
                         {
                             filename = Site.TemplateEngine.ParseResource(resourceDefinition.Name, Site, this, Counter) ?? filename;
                             title = Site.TemplateEngine.ParseResource(resourceDefinition.Title, Site, this, Counter) ?? filename;
-                            resourceParams = resourceDefinition.Params ?? [];
+                            resourceParams = resourceDefinition.Params;
                         }
                     }
                 }
diff --git a/source/Models/Site.cs b/source/Models/Site.cs
index 792920e..8a12c9b 100644
--- a/source/Models/Site.cs
+++ b/source/Models/Site.cs
@@ -1,7 +1,7 @@
 using Serilog;
 using SuCoS.Helpers;
 using SuCoS.Models.CommandLineOptions;
-using SuCoS.Parser;
+using SuCoS.Parsers;
 using SuCoS.TemplateEngine;
 using System.Collections.Concurrent;
 
@@ -82,7 +82,7 @@ public class Site : ISite
         get
         {
             _pagesCache ??= OutputReferences.Values
-                .Where(output => output is IPage page)
+                .Where(output => output is IPage)
                 .Select(output => (output as IPage)!)
                 .OrderBy(page => -page.Weight);
             return _pagesCache!;
@@ -224,7 +224,7 @@ public class Site : ISite
         relativePath = Urlizer.Path(relativePath);
         FrontMatter frontMatter = new()
         {
-            Kind = isIndex ? Kind.index : Kind.list,
+            Kind = isIndex ? Kind.Index : Kind.List,
             Section = isIndex ? "index" : sectionName,
             SourceRelativePath = Urlizer.Path(Path.Combine(relativePath, IndexLeafFileConst)),
             SourceFullPath = Urlizer.Path(Path.Combine(SourceContentPath, relativePath, IndexLeafFileConst)),
@@ -262,7 +262,7 @@ public class Site : ISite
             return page;
         }
 
-        if (page.Kind != Kind.index)
+        if (page.Kind != Kind.Index)
         {
             page.PagesReferences.Add(originalPage.Permalink);
         }
@@ -282,7 +282,6 @@ public class Site : ISite
 
         var indexBranchBundlePage = markdownFiles.FirstOrDefault(file => Path.GetFileName(file) == IndexBranchFileConst);
 
-        IPage? page = null;
         if (indexLeafBundlePage is not null || indexBranchBundlePage is not null)
         {
             // Determine the file to use and the bundle type
@@ -294,7 +293,7 @@ public class Site : ISite
                 ? Array.Empty<string>()
                 : markdownFiles.Where(file => file != selectedFile).ToArray();
 
-            page = ParseSourceFile(selectedFile!, parent, bundleType);
+            IPage? page = ParseSourceFile(selectedFile!, parent, bundleType);
             if (page is null)
             {
                 return;
@@ -304,7 +303,7 @@ public class Site : ISite
             {
                 _ = OutputReferences.TryRemove(page!.Permalink!, out _);
                 page.Permalink = "/";
-                page.Kind = Kind.index;
+                page.Kind = Kind.Index;
 
                 _ = OutputReferences.GetOrAdd(page.Permalink, page);
                 Home = page;
@@ -332,7 +331,7 @@ public class Site : ISite
         {
             var fileContent = File.ReadAllText(fileFullPath);
             var fileRelativePath = Path.GetRelativePath(
-                SourceContentPath ?? string.Empty,
+                SourceContentPath,
                 fileFullPath
             );
             // var frontMatter = Parser.ParseFrontmatterAndMarkdown(fileFullPath, fileRelativePath, fileContent)
diff --git a/source/Parsers/IMetadataParser.cs b/source/Parsers/IMetadataParser.cs
index 21974a9..d9c2031 100644
--- a/source/Parsers/IMetadataParser.cs
+++ b/source/Parsers/IMetadataParser.cs
@@ -1,6 +1,4 @@
-using SuCoS.Models;
-
-namespace SuCoS.Parser;
+namespace SuCoS.Parsers;
 
 /// <summary>
 /// Responsible for parsing the content metadata
diff --git a/source/Parsers/ParamsConverter.cs b/source/Parsers/ParamsConverter.cs
index 952b3ea..d77d238 100644
--- a/source/Parsers/ParamsConverter.cs
+++ b/source/Parsers/ParamsConverter.cs
@@ -2,7 +2,7 @@ using YamlDotNet.Core;
 using YamlDotNet.Core.Events;
 using YamlDotNet.Serialization;
 
-namespace SuCoS.Parser;
+namespace SuCoS.Parsers;
 
 /// <summary>
 /// A custom YAML type converter for dictionaries with string keys and object values.
diff --git a/source/Parsers/StaticContext.cs b/source/Parsers/StaticContext.cs
index f721b2b..9fbaf0d 100644
--- a/source/Parsers/StaticContext.cs
+++ b/source/Parsers/StaticContext.cs
@@ -1,6 +1,6 @@
 using YamlDotNet.Serialization;
 
-namespace SuCoS.Parser;
+namespace SuCoS.Parsers;
 
 /// <summary>
 /// The rest of this partial class gets generated at build time
diff --git a/source/Parsers/YAMLParser.cs b/source/Parsers/YAMLParser.cs
index fabf550..133d978 100644
--- a/source/Parsers/YAMLParser.cs
+++ b/source/Parsers/YAMLParser.cs
@@ -2,7 +2,7 @@ using System.Text;
 using FolkerKinzel.Strings;
 using YamlDotNet.Serialization;
 
-namespace SuCoS.Parser;
+namespace SuCoS.Parsers;
 
 /// <summary>
 /// Responsible for parsing the content front matter using YAML
diff --git a/source/Program.cs b/source/Program.cs
index 4b32eee..f0f4915 100644
--- a/source/Program.cs
+++ b/source/Program.cs
@@ -5,6 +5,7 @@ using SuCoS.Models.CommandLineOptions;
 using System.Reflection;
 using CommandLine;
 using System.Diagnostics.CodeAnalysis;
+using SuCoS.Commands;
 
 namespace SuCoS;
 
@@ -98,7 +99,7 @@ public class Program(ILogger logger)
                 (CheckLinkOptions options) =>
                 {
                     logger = CreateLogger(options.Verbose);
-                    var command = new CheckLinkCommand(options, logger);
+                    var command = new Commands.CheckLinkCommand(options, logger);
                     return command.Run();
                 },
                 (NewSiteOptions options) =>
diff --git a/source/ServerHandlers/RegisteredPageResourceRequest.cs b/source/ServerHandlers/RegisteredPageResourceRequest.cs
index 40015f3..21818e2 100644
--- a/source/ServerHandlers/RegisteredPageResourceRequest.cs
+++ b/source/ServerHandlers/RegisteredPageResourceRequest.cs
@@ -8,7 +8,7 @@ namespace SuCoS.ServerHandlers;
 /// </summary>
 public class RegisteredPageResourceRequest : IServerHandlers
 {
-    readonly ISite _site;
+    private readonly ISite _site;
 
     /// <summary>
     /// Constructor
diff --git a/source/ServerHandlers/StaticFileRequest.cs b/source/ServerHandlers/StaticFileRequest.cs
index 546f6fd..96b110d 100644
--- a/source/ServerHandlers/StaticFileRequest.cs
+++ b/source/ServerHandlers/StaticFileRequest.cs
@@ -42,8 +42,8 @@ public class StaticFileRequest : IServerHandlers
         ArgumentNullException.ThrowIfNull(response);
 
         var fileAbsolutePath = Path.Combine(_basePath!, requestPath.TrimStart('/'));
-        response.ContentType = GetContentType(fileAbsolutePath!);
-        await using var fileStream = new FileStream(fileAbsolutePath!, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+        response.ContentType = GetContentType(fileAbsolutePath);
+        await using var fileStream = new FileStream(fileAbsolutePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
         response.ContentLength64 = fileStream.Length;
         await fileStream.CopyToAsync(response.OutputStream).ConfigureAwait(false);
         return _inTheme ? "themeSt" : "static";
diff --git a/source/TemplateEngine/FluidTemplateEngine.cs b/source/TemplateEngine/FluidTemplateEngine.cs
index 800a2d5..ce3cfe4 100644
--- a/source/TemplateEngine/FluidTemplateEngine.cs
+++ b/source/TemplateEngine/FluidTemplateEngine.cs
@@ -64,7 +64,7 @@ public class FluidTemplateEngine : ITemplateEngine
     /// <inheritdoc/>
     public string? ParseResource(string? data, ISite site, IPage page, int counter)
     {
-        if (string.IsNullOrEmpty(data) || !FluidParser.TryParse(data, out var templateFileName, out var errorFileName))
+        if (string.IsNullOrEmpty(data) || !FluidParser.TryParse(data, out var templateFileName, out var _))
         {
             return null;
         }
@@ -83,7 +83,7 @@ public class FluidTemplateEngine : ITemplateEngine
     /// <param name="context"></param>
     /// <returns></returns>
     /// <exception cref="ArgumentNullException"></exception>
-    protected static ValueTask<FluidValue> WhereParamsFilter(FluidValue input, FilterArguments arguments, TemplateContext context)
+    private static ValueTask<FluidValue> WhereParamsFilter(FluidValue input, FilterArguments arguments, TemplateContext context)
     {
         ArgumentNullException.ThrowIfNull(input);
         ArgumentNullException.ThrowIfNull(arguments);
diff --git a/source/TemplateEngine/ITemplateEngine.cs b/source/TemplateEngine/ITemplateEngine.cs
index 639ea2b..486f010 100644
--- a/source/TemplateEngine/ITemplateEngine.cs
+++ b/source/TemplateEngine/ITemplateEngine.cs
@@ -3,7 +3,7 @@ using SuCoS.Models;
 namespace SuCoS.TemplateEngine;
 
 /// <summary>
-/// Interface for all Templace Engines (Liquid)
+/// Interface for all Template Engines (Liquid)
 /// </summary>
 public interface ITemplateEngine
 {
diff --git a/test/Commands/BaseGeneratorCommandTests.cs b/test/Commands/BaseGeneratorCommandTests.cs
index e52486f..a721499 100644
--- a/test/Commands/BaseGeneratorCommandTests.cs
+++ b/test/Commands/BaseGeneratorCommandTests.cs
@@ -4,6 +4,8 @@ using SuCoS;
 using SuCoS.Models.CommandLineOptions;
 using SuCoS.TemplateEngine;
 using System.Reflection;
+using SuCoS.Commands;
+using SuCoS.Helpers;
 using Xunit;
 
 namespace Tests.Commands;
@@ -20,7 +22,7 @@ public class BaseGeneratorCommandTests
     private class BaseGeneratorCommandStub(IGenerateOptions options, ILogger logger, IFileSystem fs)
         : BaseGeneratorCommand(options, logger, fs);
 
-    readonly IFileSystem _fs;
+    private readonly IFileSystem _fs;
 
     public BaseGeneratorCommandTests()
     {
diff --git a/test/Commands/BuildCommandTests.cs b/test/Commands/BuildCommandTests.cs
index 3f184ad..3b16b3d 100644
--- a/test/Commands/BuildCommandTests.cs
+++ b/test/Commands/BuildCommandTests.cs
@@ -3,14 +3,16 @@ using Xunit;
 using NSubstitute;
 using Serilog;
 using SuCoS;
+using SuCoS.Commands;
+using SuCoS.Helpers;
 
 namespace Tests.Commands;
 
 public class BuildCommandTests
 {
-    readonly ILogger _logger;
-    readonly IFileSystem _fileSystem;
-    readonly BuildOptions _options;
+    private readonly ILogger _logger;
+    private readonly IFileSystem _fileSystem;
+    private readonly BuildOptions _options;
 
     public BuildCommandTests()
     {
diff --git a/test/Commands/NewSiteCommandTests.cs b/test/Commands/NewSiteCommandTests.cs
index 77abedd..dcd986b 100644
--- a/test/Commands/NewSiteCommandTests.cs
+++ b/test/Commands/NewSiteCommandTests.cs
@@ -4,14 +4,16 @@ using SuCoS.Models.CommandLineOptions;
 using Xunit;
 using NSubstitute;
 using Serilog;
+using SuCoS.Commands;
+using SuCoS.Helpers;
 
 namespace Tests.Commands;
 
 public class NewSiteCommandTests
 {
-    readonly ILogger _logger;
-    readonly IFileSystem _fileSystem;
-    readonly ISite _site;
+    private readonly ILogger _logger;
+    private readonly IFileSystem _fileSystem;
+    private readonly ISite _site;
 
     public NewSiteCommandTests()
     {
diff --git a/test/Models/FrontMatterTests.cs b/test/Models/FrontMatterTests.cs
index bb33cdd..2b01efc 100644
--- a/test/Models/FrontMatterTests.cs
+++ b/test/Models/FrontMatterTests.cs
@@ -7,9 +7,9 @@ namespace Tests.Models;
 public class FrontMatterTests : TestSetup
 {
     [Theory]
-    [InlineData("Title1", "Section1", "Type1", "URL1", Kind.single)]
-    [InlineData("Title2", "Section2", "Type2", "URL2", Kind.list)]
-    [InlineData("Title3", "Section3", "Type3", "URL3", Kind.index)]
+    [InlineData("Title1", "Section1", "Type1", "URL1", Kind.Single)]
+    [InlineData("Title2", "Section2", "Type2", "URL2", Kind.List)]
+    [InlineData("Title3", "Section3", "Type3", "URL3", Kind.Index)]
     public void Constructor_Sets_Properties_Correctly(string title, string section, string type, string url, Kind kind)
     {
         // Act
diff --git a/test/Models/PageTests.cs b/test/Models/PageTests.cs
index 86c5d82..daf217f 100644
--- a/test/Models/PageTests.cs
+++ b/test/Models/PageTests.cs
@@ -53,7 +53,7 @@ word03 word04 word05 6 7 eight
 
         // Assert
         Assert.Equal(string.Empty, page.Section);
-        Assert.Equal(Kind.single, page.Kind);
+        Assert.Equal(Kind.Single, page.Kind);
         Assert.Equal("page", page.Type);
         Assert.Null(page.URL);
         Assert.Empty(page.Params);
@@ -238,8 +238,8 @@ word03 word04 word05 6 7 eight
     }
 
     [Theory]
-    [InlineData(Kind.single, true)]
-    [InlineData(Kind.list, false)]
+    [InlineData(Kind.Single, true)]
+    [InlineData(Kind.List, false)]
     public void RegularPages_ShouldReturnCorrectPages_WhenKindIsSingle(Kind kind, bool isExpectedPage)
     {
         var page = new Page(FrontMatterMock, Site) { Kind = kind };
diff --git a/test/Models/SiteTests.cs b/test/Models/SiteTests.cs
index 3e97f2f..12ab863 100644
--- a/test/Models/SiteTests.cs
+++ b/test/Models/SiteTests.cs
@@ -2,6 +2,7 @@ using SuCoS;
 using SuCoS.Helpers;
 using SuCoS.Models;
 using SuCoS.Models.CommandLineOptions;
+using SuCoS.Parsers;
 using Xunit;
 
 namespace Tests.Models;
@@ -11,7 +12,7 @@ namespace Tests.Models;
 /// </summary>
 public class SiteTests : TestSetup
 {
-    readonly IFileSystem _fs;
+    private readonly IFileSystem _fs;
 
     public SiteTests()
     {
@@ -94,7 +95,7 @@ public class SiteTests : TestSetup
         Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        Assert.Equal(expectedQuantity, Site.OutputReferences.Values.Where(output => output is IPage page).Count());
+        Assert.Equal(expectedQuantity, Site.OutputReferences.Values.Where(output => output is IPage).Count());
     }
 
     [Theory]
@@ -241,7 +242,7 @@ public class SiteTests : TestSetup
         {
             SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst05))
         };
-        var parser = new SuCoS.Parser.YamlParser();
+        var parser = new YamlParser();
         var siteSettings = SiteHelper.ParseSettings("sucos.yaml", options, parser, _fs);
         Site = new Site(options, siteSettings, parser, LoggerMock, null);
 
@@ -269,7 +270,7 @@ public class SiteTests : TestSetup
         {
             SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst07))
         };
-        var parser = new SuCoS.Parser.YamlParser();
+        var parser = new YamlParser();
         var siteSettings = SiteHelper.ParseSettings("sucos.yaml", options, parser, _fs);
         Site = new Site(options, siteSettings, parser, LoggerMock, null);
 
@@ -311,7 +312,7 @@ public class SiteTests : TestSetup
         {
             SourceArgument = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst06))
         };
-        var parser = new SuCoS.Parser.YamlParser();
+        var parser = new YamlParser();
         var siteSettings = SiteHelper.ParseSettings("sucos.yaml", options, parser, _fs);
         Site = new Site(options, siteSettings, parser, LoggerMock, null);
 
diff --git a/test/Parser/YAMLParserTests.cs b/test/Parser/YAMLParserTests.cs
index bc74c19..871f1c2 100644
--- a/test/Parser/YAMLParserTests.cs
+++ b/test/Parser/YAMLParserTests.cs
@@ -1,13 +1,14 @@
 using SuCoS.Helpers;
 using SuCoS.Models;
 using System.Globalization;
+using SuCoS.Parsers;
 using Xunit;
 
 namespace Tests.YAMLParser;
 
 public class YamlParserTests : TestSetup
 {
-    private readonly SuCoS.Parser.YamlParser _parser;
+    private readonly YamlParser _parser;
 
     private const string PageFrontmaterConst = @"Title: Test Title
 Type: post
@@ -61,7 +62,7 @@ Params:
 
     public YamlParserTests()
     {
-        _parser = new SuCoS.Parser.YamlParser();
+        _parser = new YamlParser();
         _pageContent = @$"---
 {PageFrontmaterConst}
 ---
diff --git a/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs b/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs
index eb5c8a0..24c3118 100644
--- a/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs
+++ b/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs
@@ -3,6 +3,7 @@ using SuCoS;
 using SuCoS.Helpers;
 using SuCoS.Models;
 using SuCoS.Models.CommandLineOptions;
+using SuCoS.Parsers;
 using SuCoS.ServerHandlers;
 using Xunit;
 
@@ -10,7 +11,7 @@ namespace Tests.ServerHandlers;
 
 public class RegisteredPageRequestHandlerTests : TestSetup
 {
-    readonly IFileSystem _fs;
+    private readonly IFileSystem _fs;
 
     public RegisteredPageRequestHandlerTests()
     {
@@ -48,7 +49,7 @@ public class RegisteredPageRequestHandlerTests : TestSetup
         {
             SourceArgument = siteFullPath
         };
-        var parser = new SuCoS.Parser.YamlParser();
+        var parser = new YamlParser();
         var siteSettings = SiteHelper.ParseSettings("sucos.yaml", options, parser, _fs);
         Site = new Site(options, siteSettings, parser, LoggerMock, null);
 
diff --git a/test/TestSetup.cs b/test/TestSetup.cs
index 0699e39..3eb7f1a 100644
--- a/test/TestSetup.cs
+++ b/test/TestSetup.cs
@@ -2,7 +2,7 @@ using NSubstitute;
 using Serilog;
 using SuCoS.Models;
 using SuCoS.Models.CommandLineOptions;
-using SuCoS.Parser;
+using SuCoS.Parsers;
 using System.Globalization;
 
 namespace Tests;
@@ -23,7 +23,7 @@ public class TestSetup
     protected const string TestSitePathConst07 = ".TestSites/07-theme-no-baseof-error";
     protected const string TestSitePathConst08 = ".TestSites/08-theme-html";
 
-    protected readonly IMetadataParser FrontMatterParser = new SuCoS.Parser.YamlParser();
+    protected readonly IMetadataParser FrontMatterParser = new YamlParser();
     protected readonly IGenerateOptions GenerateOptionsMock = Substitute.For<IGenerateOptions>();
     protected readonly SiteSettings SiteSettingsMock = Substitute.For<SiteSettings>();
     protected readonly ILogger LoggerMock = Substitute.For<ILogger>();
-- 
GitLab


From d5d86d0d20d00079c8e93ad6e74474b966c21008 Mon Sep 17 00:00:00 2001
From: Bruno Massa <brmassa@gmail.com>
Date: Tue, 7 May 2024 12:20:17 -0500
Subject: [PATCH 4/8] fix: medium severity Qodana/Rider suggestions

---
 source/Commands/CheckLinkCommand.cs           |  2 +-
 source/Commands/ServeCommand.cs               | 16 +++++-----
 source/Helpers/Urlizer.cs                     |  4 +--
 source/Models/Page.cs                         | 16 +++++-----
 source/Models/Resource.cs                     |  2 +-
 source/Models/Site.cs                         |  8 ++---
 source/Parsers/StaticContext.cs               |  4 +--
 .../HttpListenerResponseWrapper.cs            | 12 +++----
 source/ServerHandlers/PingRequests.cs         |  2 +-
 .../ServerHandlers/RegisteredPageRequest.cs   | 13 +++-----
 .../RegisteredPageResourceRequest.cs          | 31 ++-----------------
 test/Models/PageTests.cs                      |  2 +-
 test/TestSetup.cs                             |  6 ++--
 13 files changed, 42 insertions(+), 76 deletions(-)

diff --git a/source/Commands/CheckLinkCommand.cs b/source/Commands/CheckLinkCommand.cs
index 81788b5..0f7428e 100644
--- a/source/Commands/CheckLinkCommand.cs
+++ b/source/Commands/CheckLinkCommand.cs
@@ -75,7 +75,7 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
         await Parallel.ForEachAsync(files, options, async (filePath, token) =>
         {
             var fileNameSanitized = filePath[directoryPath.Length..].Trim('/', '\\');
-            var fileText = File.ReadAllText(filePath);
+            var fileText = await File.ReadAllTextAsync(filePath, token);
             var matches = UrlRegex.Matches(fileText);
             if (matches.Count == 0)
             {
diff --git a/source/Commands/ServeCommand.cs b/source/Commands/ServeCommand.cs
index 4909421..c03cbca 100644
--- a/source/Commands/ServeCommand.cs
+++ b/source/Commands/ServeCommand.cs
@@ -16,16 +16,16 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
 
     /// <summary>
     /// The ServeOptions object containing the configuration parameters for the server.
-    /// This includes settings such as the source directory to watch for file changes, 
-    /// verbosity of the logs, etc. These options are passed into the ServeCommand at construction 
+    /// This includes settings such as the source directory to watch for file changes,
+    /// verbosity of the logs, etc. These options are passed into the ServeCommand at construction
     /// and are used throughout its operation.
     /// </summary>
     private readonly ServeOptions _options;
 
     /// <summary>
     /// The FileSystemWatcher object that monitors the source directory for file changes.
-    /// When a change is detected, this triggers a server restart to ensure the served content 
-    /// remains up-to-date. The FileSystemWatcher is configured with the source directory 
+    /// When a change is detected, this triggers a server restart to ensure the served content
+    /// remains up-to-date. The FileSystemWatcher is configured with the source directory
     /// at construction and starts watching immediately.
     /// </summary>
     private readonly IFileWatcher _fileWatcher;
@@ -39,7 +39,7 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
     private Timer? _debounceTimer;
 
     /// <summary>
-    /// A SemaphoreSlim used to ensure that server restarts due to file changes occur sequentially, 
+    /// A SemaphoreSlim used to ensure that server restarts due to file changes occur sequentially,
     /// not concurrently. This is necessary because a restart involves stopping the current server
     /// and starting a new one, which would not be thread-safe without some form of synchronization.
     /// </summary>
@@ -164,9 +164,9 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
     {
         _ = await _lastRestartTask.ContinueWith(async _ =>
         {
-            Logger.Information($"Restarting server...");
+            Logger.Information("Restarting server...");
 
-            if (_listener != null && _listener.IsListening)
+            if (_listener is { IsListening: true })
             {
                 _listener.Stop();
                 _listener.Close();
@@ -236,7 +236,7 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
     private static async Task HandleNotFoundRequest(HttpListenerContext context)
     {
         context.Response.StatusCode = 404;
-        using var writer = new StreamWriter(context.Response.OutputStream);
+        await using var writer = new StreamWriter(context.Response.OutputStream);
         await writer.WriteAsync("404 - File Not Found").ConfigureAwait(false);
     }
 
diff --git a/source/Helpers/Urlizer.cs b/source/Helpers/Urlizer.cs
index 1e783a5..abd8013 100644
--- a/source/Helpers/Urlizer.cs
+++ b/source/Helpers/Urlizer.cs
@@ -8,10 +8,10 @@ namespace SuCoS.Helpers;
 /// </summary>
 public static partial class Urlizer
 {
-    [GeneratedRegex(@"[^a-zA-Z0-9]+")]
+    [GeneratedRegex("[^a-zA-Z0-9]+")]
     private static partial Regex UrlizeRegexAlpha();
 
-    [GeneratedRegex(@"[^a-zA-Z0-9.]+")]
+    [GeneratedRegex("[^a-zA-Z0-9.]+")]
     private static partial Regex UrlizeRegexAlphaDot();
 
     /// <summary>
diff --git a/source/Models/Page.cs b/source/Models/Page.cs
index e37c52d..8c0053d 100644
--- a/source/Models/Page.cs
+++ b/source/Models/Page.cs
@@ -198,8 +198,7 @@ public class Page : IPage
             PagesCached = [];
             foreach (var permalink in PagesReferences)
             {
-                var page = Site.OutputReferences[permalink] as IPage;
-                if (page is not null)
+                if (Site.OutputReferences[permalink] is IPage page)
                 {
                     PagesCached.Add(page);
                 }
@@ -247,14 +246,15 @@ public class Page : IPage
                 }
             }
 
-            if (Resources is not null)
+            if (Resources is null)
             {
-                foreach (var resource in Resources)
+                return urls;
+            }
+            foreach (var resource in Resources)
+            {
+                if (resource.Permalink is not null)
                 {
-                    if (resource.Permalink is not null && !urls.ContainsKey(resource.Permalink))
-                    {
-                        urls.Add(resource.Permalink, resource);
-                    }
+                    urls.TryAdd(resource.Permalink, resource);
                 }
             }
 
diff --git a/source/Models/Resource.cs b/source/Models/Resource.cs
index 0bae647..fdb863f 100644
--- a/source/Models/Resource.cs
+++ b/source/Models/Resource.cs
@@ -12,7 +12,7 @@ public class Resource : IResource
     public string? FileName { get; set; }
 
     /// <inheritdoc/>
-    public required string SourceFullPath { get; set; }
+    public required string SourceFullPath { get; init; }
 
     /// <inheritdoc/>
     public string? SourceRelativePath => null;
diff --git a/source/Models/Site.cs b/source/Models/Site.cs
index 8a12c9b..f065b81 100644
--- a/source/Models/Site.cs
+++ b/source/Models/Site.cs
@@ -72,7 +72,7 @@ public class Site : ISite
     /// <summary>
     /// Theme used.
     /// </summary>
-    public Theme? Theme { get; set; }
+    public Theme? Theme { get; }
 
     /// <summary>
     /// List of all pages, including generated.
@@ -102,7 +102,7 @@ public class Site : ISite
         get
         {
             _regularPagesCache ??= OutputReferences
-                    .Where(pair => pair.Value is IPage page && page.IsPage && pair.Key == page.Permalink)
+                    .Where(pair => pair.Value is IPage { IsPage: true } page && pair.Key == page.Permalink)
                     .Select(pair => (pair.Value as IPage)!)
                     .OrderBy(page => -page.Weight);
             return _regularPagesCache;
@@ -130,7 +130,7 @@ public class Site : ISite
     public int FilesParsedToReport => _filesParsedToReport;
 
     /// <inheritdoc/>
-    public IMetadataParser Parser { get; init; } = new YamlParser();
+    public IMetadataParser Parser { get; }
 
     private int _filesParsedToReport;
 
@@ -155,7 +155,7 @@ public class Site : ISite
     private readonly ISystemClock _clock;
 
     /// <inheritdoc/>
-    public ITemplateEngine TemplateEngine { get; set; }
+    public ITemplateEngine TemplateEngine { get; }
 
     /// <summary>
     /// Constructor
diff --git a/source/Parsers/StaticContext.cs b/source/Parsers/StaticContext.cs
index 9fbaf0d..80e656d 100644
--- a/source/Parsers/StaticContext.cs
+++ b/source/Parsers/StaticContext.cs
@@ -6,6 +6,4 @@ namespace SuCoS.Parsers;
 /// The rest of this partial class gets generated at build time
 /// </summary>
 [YamlStaticContext]
-public partial class StaticAotContext : StaticContext
-{
-}
+public partial class StaticAotContext : StaticContext;
diff --git a/source/ServerHandlers/HttpListenerResponseWrapper.cs b/source/ServerHandlers/HttpListenerResponseWrapper.cs
index 4fd2480..05f1f0e 100644
--- a/source/ServerHandlers/HttpListenerResponseWrapper.cs
+++ b/source/ServerHandlers/HttpListenerResponseWrapper.cs
@@ -11,22 +11,20 @@ namespace SuCoS.ServerHandlers;
 /// <param name="response"></param>
 public class HttpListenerResponseWrapper(HttpListenerResponse response) : IHttpListenerResponse
 {
-    private readonly HttpListenerResponse _response = response;
-
     /// <inheritdoc />
-    public Stream OutputStream => _response.OutputStream;
+    public Stream OutputStream => response.OutputStream;
 
     /// <inheritdoc />
     public string? ContentType
     {
-        get => _response.ContentType;
-        set => _response.ContentType = value;
+        get => response.ContentType;
+        set => response.ContentType = value;
     }
 
     /// <inheritdoc />
     public long ContentLength64
     {
-        get => _response.ContentLength64;
-        set => _response.ContentLength64 = value;
+        get => response.ContentLength64;
+        set => response.ContentLength64 = value;
     }
 }
diff --git a/source/ServerHandlers/PingRequests.cs b/source/ServerHandlers/PingRequests.cs
index 3d2f571..bf9003d 100644
--- a/source/ServerHandlers/PingRequests.cs
+++ b/source/ServerHandlers/PingRequests.cs
@@ -18,7 +18,7 @@ public class PingRequests : IServerHandlers
 
         var content = serverStartTime.ToString("o");
 
-        using var writer = new StreamWriter(response.OutputStream, leaveOpen: true);
+        await using var writer = new StreamWriter(response.OutputStream, leaveOpen: true);
         await writer.WriteAsync(content).ConfigureAwait(false);
         await writer.FlushAsync().ConfigureAwait(false);
 
diff --git a/source/ServerHandlers/RegisteredPageRequest.cs b/source/ServerHandlers/RegisteredPageRequest.cs
index 51fed83..dc0e10e 100644
--- a/source/ServerHandlers/RegisteredPageRequest.cs
+++ b/source/ServerHandlers/RegisteredPageRequest.cs
@@ -24,7 +24,7 @@ public class RegisteredPageRequest : IServerHandlers
     {
         ArgumentNullException.ThrowIfNull(requestPath);
 
-        return _site.OutputReferences.TryGetValue(requestPath, out var item) && item is IPage _;
+        return _site.OutputReferences.TryGetValue(requestPath, out var item) && item is IPage;
     }
 
     /// <inheritdoc />
@@ -36,14 +36,12 @@ public class RegisteredPageRequest : IServerHandlers
         {
             var content = page.CompleteContent;
             content = InjectReloadScript(content);
-            using var writer = new StreamWriter(response.OutputStream, leaveOpen: true);
+            await using var writer = new StreamWriter(response.OutputStream, leaveOpen: true);
             await writer.WriteAsync(content).ConfigureAwait(false);
             return "dict";
         }
-        else
-        {
-            return "404";
-        }
+
+        return "404";
     }
 
     /// <summary>
@@ -55,12 +53,11 @@ public class RegisteredPageRequest : IServerHandlers
     private string InjectReloadScript(string content)
     {
         // Read the content of the JavaScript file
-        string scriptContent;
         var assembly = Assembly.GetExecutingAssembly();
         using var stream = assembly.GetManifestResourceStream("SuCoS.wwwroot.js.reload.js")
             ?? throw new FileNotFoundException("Could not find the embedded JavaScript resource.");
         using var reader = new StreamReader(stream);
-        scriptContent = reader.ReadToEnd();
+        var scriptContent = reader.ReadToEnd();
 
         // Inject the JavaScript content
         var reloadScript = $"<script>{scriptContent}</script>";
diff --git a/source/ServerHandlers/RegisteredPageResourceRequest.cs b/source/ServerHandlers/RegisteredPageResourceRequest.cs
index 21818e2..e5f7fe0 100644
--- a/source/ServerHandlers/RegisteredPageResourceRequest.cs
+++ b/source/ServerHandlers/RegisteredPageResourceRequest.cs
@@ -24,7 +24,7 @@ public class RegisteredPageResourceRequest : IServerHandlers
     {
         ArgumentNullException.ThrowIfNull(requestPath);
 
-        return _site.OutputReferences.TryGetValue(requestPath, out var item) && item is IResource _;
+        return _site.OutputReferences.TryGetValue(requestPath, out var item) && item is IResource;
     }
 
     /// <inheritdoc />
@@ -39,34 +39,7 @@ public class RegisteredPageResourceRequest : IServerHandlers
             await fileStream.CopyToAsync(response.OutputStream).ConfigureAwait(false);
             return "resource";
         }
-        else
-        {
-            return "404";
-        }
-    }
-
-    /// <summary>
-    /// Injects a reload script into the provided content.
-    /// The script is read from a JavaScript file and injected before the closing "body" tag.
-    /// </summary>
-    /// <param name="content">The content to inject the reload script into.</param>
-    /// <returns>The content with the reload script injected.</returns>
-    private static string InjectReloadScript(string content)
-    {
-        // Read the content of the JavaScript file
-        string scriptContent;
-        var assembly = Assembly.GetExecutingAssembly();
-        using var stream = assembly.GetManifestResourceStream("SuCoS.wwwroot.js.reload.js")
-            ?? throw new FileNotFoundException("Could not find the embedded JavaScript resource.");
-        using var reader = new StreamReader(stream);
-        scriptContent = reader.ReadToEnd();
-
-        // Inject the JavaScript content
-        var reloadScript = $"<script>{scriptContent}</script>";
-
-        const string bodyClosingTag = "</body>";
-        content = content.Replace(bodyClosingTag, $"{reloadScript}{bodyClosingTag}", StringComparison.InvariantCulture);
 
-        return content;
+        return "404";
     }
 }
diff --git a/test/Models/PageTests.cs b/test/Models/PageTests.cs
index daf217f..b352c13 100644
--- a/test/Models/PageTests.cs
+++ b/test/Models/PageTests.cs
@@ -81,7 +81,7 @@ word03 word04 word05 6 7 eight
         {
             Title = TitleConst,
             SourceRelativePath = SourcePathConst,
-            Aliases = new() { "v123", "{{ page.Title }}", "{{ page.Title }}-2" }
+            Aliases = ["v123", "{{ page.Title }}", "{{ page.Title }}-2"]
         }, Site);
 
         // Act
diff --git a/test/TestSetup.cs b/test/TestSetup.cs
index 3eb7f1a..fdaaaa3 100644
--- a/test/TestSetup.cs
+++ b/test/TestSetup.cs
@@ -25,7 +25,7 @@ public class TestSetup
 
     protected readonly IMetadataParser FrontMatterParser = new YamlParser();
     protected readonly IGenerateOptions GenerateOptionsMock = Substitute.For<IGenerateOptions>();
-    protected readonly SiteSettings SiteSettingsMock = Substitute.For<SiteSettings>();
+    private readonly SiteSettings _siteSettingsMock = Substitute.For<SiteSettings>();
     protected readonly ILogger LoggerMock = Substitute.For<ILogger>();
     protected readonly ISystemClock SystemClockMock = Substitute.For<ISystemClock>();
     protected readonly IFrontMatter FrontMatterMock = new FrontMatter()
@@ -40,10 +40,10 @@ public class TestSetup
     // that is typically "bin/Debug/netX.0/test.dll"
     protected const string TestSitesPath = "../../..";
 
-    public TestSetup()
+    protected TestSetup()
     {
         _ = SystemClockMock.Now.Returns(TodayDate);
-        Site = new Site(GenerateOptionsMock, SiteSettingsMock, FrontMatterParser, LoggerMock, SystemClockMock);
+        Site = new Site(GenerateOptionsMock, _siteSettingsMock, FrontMatterParser, LoggerMock, SystemClockMock);
     }
 
     public TestSetup(SiteSettings siteSettings)
-- 
GitLab


From 223bb1dea496a175a531b2bb4cb79f5e95746230 Mon Sep 17 00:00:00 2001
From: Bruno Massa <brmassa@gmail.com>
Date: Tue, 7 May 2024 12:25:27 -0500
Subject: [PATCH 5/8] refactor: move test folder to Tests

---
 .nuke/Build.Test.cs                                           | 4 ++--
 SuCoS.sln                                                     | 2 +-
 {test => Tests}/.TestSites/01/content/categories.md           | 0
 {test => Tests}/.TestSites/01/content/date-future.md          | 0
 {test => Tests}/.TestSites/01/content/date-ok.md              | 0
 {test => Tests}/.TestSites/01/content/expired.md              | 0
 {test => Tests}/.TestSites/01/content/publishdate-future.md   | 0
 {test => Tests}/.TestSites/01/content/publishdate-ok.md       | 0
 {test => Tests}/.TestSites/01/content/test01.md               | 0
 {test => Tests}/.TestSites/01/sucos.yaml                      | 0
 {test => Tests}/.TestSites/02-have-index/content/alias.md     | 0
 .../.TestSites/02-have-index/content/categories.md            | 0
 .../.TestSites/02-have-index/content/date-future.md           | 0
 {test => Tests}/.TestSites/02-have-index/content/date-ok.md   | 0
 {test => Tests}/.TestSites/02-have-index/content/expired.md   | 0
 {test => Tests}/.TestSites/02-have-index/content/index.md     | 0
 .../.TestSites/02-have-index/content/publishdate-future.md    | 0
 .../.TestSites/02-have-index/content/publishdate-ok.md        | 0
 {test => Tests}/.TestSites/02-have-index/content/test01.md    | 0
 {test => Tests}/.TestSites/02-have-index/sucos.yaml           | 0
 {test => Tests}/.TestSites/03-section/content/blog/alias.md   | 0
 .../.TestSites/03-section/content/blog/categories.md          | 0
 .../.TestSites/03-section/content/blog/date-future.md         | 0
 {test => Tests}/.TestSites/03-section/content/blog/date-ok.md | 0
 {test => Tests}/.TestSites/03-section/content/blog/expired.md | 0
 .../.TestSites/03-section/content/blog/publishdate-future.md  | 0
 .../.TestSites/03-section/content/blog/publishdate-ok.md      | 0
 {test => Tests}/.TestSites/03-section/content/blog/test01.md  | 0
 .../.TestSites/03-section/content/blog/weight-negative-1.md   | 0
 .../.TestSites/03-section/content/blog/weight-negative-100.md | 0
 .../.TestSites/03-section/content/blog/weight-positive-1.md   | 0
 .../.TestSites/03-section/content/blog/weight-positive-100.md | 0
 {test => Tests}/.TestSites/03-section/sucos.yaml              | 0
 {test => Tests}/.TestSites/04-tags/content/blog/categories.md | 0
 .../.TestSites/04-tags/content/blog/date-future.md            | 0
 {test => Tests}/.TestSites/04-tags/content/blog/date-ok.md    | 0
 {test => Tests}/.TestSites/04-tags/content/blog/expired.md    | 0
 .../.TestSites/04-tags/content/blog/publishdate-future.md     | 0
 .../.TestSites/04-tags/content/blog/publishdate-ok.md         | 0
 .../.TestSites/04-tags/content/blog/subsection/alias.md       | 0
 {test => Tests}/.TestSites/04-tags/content/blog/tags-01.md    | 0
 {test => Tests}/.TestSites/04-tags/content/blog/tags-02.md    | 0
 {test => Tests}/.TestSites/04-tags/content/blog/tags-03.md    | 0
 {test => Tests}/.TestSites/04-tags/content/blog/tags-04.md    | 0
 {test => Tests}/.TestSites/04-tags/content/blog/tags-05.md    | 0
 {test => Tests}/.TestSites/04-tags/content/blog/tags-06.md    | 0
 {test => Tests}/.TestSites/04-tags/content/blog/tags-07.md    | 0
 {test => Tests}/.TestSites/04-tags/content/blog/tags-08.md    | 0
 {test => Tests}/.TestSites/04-tags/content/blog/tags-09.md    | 0
 {test => Tests}/.TestSites/04-tags/content/blog/tags-10.md    | 0
 {test => Tests}/.TestSites/04-tags/content/blog/test01.md     | 0
 .../.TestSites/04-tags/content/blog/weight-negative-1.md      | 0
 .../.TestSites/04-tags/content/blog/weight-negative-100.md    | 0
 .../.TestSites/04-tags/content/blog/weight-positive-1.md      | 0
 .../.TestSites/04-tags/content/blog/weight-positive-100.md    | 0
 {test => Tests}/.TestSites/04-tags/content/index.md           | 0
 {test => Tests}/.TestSites/04-tags/sucos.yaml                 | 0
 .../.TestSites/05-theme-no-baseof/content/blog/alias.md       | 0
 .../.TestSites/05-theme-no-baseof/content/blog/categories.md  | 0
 .../.TestSites/05-theme-no-baseof/content/blog/date-future.md | 0
 .../.TestSites/05-theme-no-baseof/content/blog/date-ok.md     | 0
 .../.TestSites/05-theme-no-baseof/content/blog/expired.md     | 0
 .../05-theme-no-baseof/content/blog/publishdate-future.md     | 0
 .../05-theme-no-baseof/content/blog/publishdate-ok.md         | 0
 .../.TestSites/05-theme-no-baseof/content/blog/tags-01.md     | 0
 .../.TestSites/05-theme-no-baseof/content/blog/tags-02.md     | 0
 .../.TestSites/05-theme-no-baseof/content/blog/test01.md      | 0
 .../05-theme-no-baseof/content/blog/weight-negative-1.md      | 0
 .../05-theme-no-baseof/content/blog/weight-negative-100.md    | 0
 .../05-theme-no-baseof/content/blog/weight-positive-1.md      | 0
 .../05-theme-no-baseof/content/blog/weight-positive-100.md    | 0
 .../.TestSites/05-theme-no-baseof/content/index.md            | 0
 {test => Tests}/.TestSites/05-theme-no-baseof/index.md        | 0
 {test => Tests}/.TestSites/05-theme-no-baseof/sucos.yaml      | 0
 .../05-theme-no-baseof/themes/test/_default/index.liquid      | 0
 .../05-theme-no-baseof/themes/test/_default/list.liquid       | 0
 .../05-theme-no-baseof/themes/test/_default/single.liquid     | 0
 {test => Tests}/.TestSites/06-theme/content/blog/alias.md     | 0
 .../.TestSites/06-theme/content/blog/categories.md            | 0
 .../.TestSites/06-theme/content/blog/date-future.md           | 0
 {test => Tests}/.TestSites/06-theme/content/blog/date-ok.md   | 0
 {test => Tests}/.TestSites/06-theme/content/blog/expired.md   | 0
 .../.TestSites/06-theme/content/blog/publishdate-future.md    | 0
 .../.TestSites/06-theme/content/blog/publishdate-ok.md        | 0
 {test => Tests}/.TestSites/06-theme/content/blog/tags-01.md   | 0
 {test => Tests}/.TestSites/06-theme/content/blog/tags-02.md   | 0
 {test => Tests}/.TestSites/06-theme/content/blog/test01.md    | 0
 .../.TestSites/06-theme/content/blog/weight-negative-1.md     | 0
 .../.TestSites/06-theme/content/blog/weight-negative-100.md   | 0
 .../.TestSites/06-theme/content/blog/weight-positive-1.md     | 0
 .../.TestSites/06-theme/content/blog/weight-positive-100.md   | 0
 {test => Tests}/.TestSites/06-theme/content/index.md          | 0
 {test => Tests}/.TestSites/06-theme/index.md                  | 0
 {test => Tests}/.TestSites/06-theme/sucos.yaml                | 0
 .../.TestSites/06-theme/themes/test/_default/baseof.liquid    | 0
 .../.TestSites/06-theme/themes/test/_default/index.liquid     | 0
 .../.TestSites/06-theme/themes/test/_default/list.liquid      | 0
 .../.TestSites/06-theme/themes/test/_default/single.liquid    | 0
 .../.TestSites/07-theme-no-baseof-error/content/blog/alias.md | 0
 .../07-theme-no-baseof-error/content/blog/categories.md       | 0
 .../07-theme-no-baseof-error/content/blog/date-future.md      | 0
 .../07-theme-no-baseof-error/content/blog/date-ok.md          | 0
 .../07-theme-no-baseof-error/content/blog/expired.md          | 0
 .../content/blog/publishdate-future.md                        | 0
 .../07-theme-no-baseof-error/content/blog/publishdate-ok.md   | 0
 .../07-theme-no-baseof-error/content/blog/tags-01.md          | 0
 .../07-theme-no-baseof-error/content/blog/tags-02.md          | 0
 .../07-theme-no-baseof-error/content/blog/test01.md           | 0
 .../content/blog/weight-negative-1.md                         | 0
 .../content/blog/weight-negative-100.md                       | 0
 .../content/blog/weight-positive-1.md                         | 0
 .../content/blog/weight-positive-100.md                       | 0
 .../.TestSites/07-theme-no-baseof-error/content/index.md      | 0
 {test => Tests}/.TestSites/07-theme-no-baseof-error/index.md  | 0
 .../.TestSites/07-theme-no-baseof-error/sucos.yaml            | 0
 .../themes/test/_default/index.liquid                         | 0
 .../07-theme-no-baseof-error/themes/test/_default/list.liquid | 0
 .../themes/test/_default/single.liquid                        | 0
 .../.TestSites/08-theme-html/content/blog/alias.md            | 0
 .../.TestSites/08-theme-html/content/blog/categories.md       | 0
 .../.TestSites/08-theme-html/content/blog/date-future.md      | 0
 .../.TestSites/08-theme-html/content/blog/date-ok.md          | 0
 .../.TestSites/08-theme-html/content/blog/expired.md          | 0
 .../08-theme-html/content/blog/publishdate-future.md          | 0
 .../.TestSites/08-theme-html/content/blog/publishdate-ok.md   | 0
 .../.TestSites/08-theme-html/content/blog/tags-01.md          | 0
 .../.TestSites/08-theme-html/content/blog/tags-02.md          | 0
 .../.TestSites/08-theme-html/content/blog/test01.md           | 0
 .../08-theme-html/content/blog/weight-negative-1.md           | 0
 .../08-theme-html/content/blog/weight-negative-100.md         | 0
 .../08-theme-html/content/blog/weight-positive-1.md           | 0
 .../08-theme-html/content/blog/weight-positive-100.md         | 0
 {test => Tests}/.TestSites/08-theme-html/content/index.md     | 0
 {test => Tests}/.TestSites/08-theme-html/index.md             | 0
 {test => Tests}/.TestSites/08-theme-html/sucos.yaml           | 0
 .../08-theme-html/themes/test/_default/baseof.liquid          | 0
 .../08-theme-html/themes/test/_default/index.liquid           | 0
 .../.TestSites/08-theme-html/themes/test/_default/list.liquid | 0
 .../08-theme-html/themes/test/_default/single.liquid          | 0
 {test => Tests}/Commands/BaseGeneratorCommandTests.cs         | 0
 {test => Tests}/Commands/BuildCommandTests.cs                 | 0
 {test => Tests}/Commands/NewSiteCommandTests.cs               | 0
 {test => Tests}/Helpers/StopwatchReporterTests.cs             | 0
 {test => Tests}/Helpers/UrlizerTests.cs                       | 0
 {test => Tests}/Models/FrontMatterTests.cs                    | 0
 {test => Tests}/Models/PageTests.cs                           | 0
 {test => Tests}/Models/SiteTests.cs                           | 0
 {test => Tests}/Parser/YAMLParserTests.cs                     | 0
 {test => Tests}/ProgramTest.cs                                | 0
 {test => Tests}/ServerHandlers/PingRequestHandlerTests.cs     | 0
 .../ServerHandlers/RegisteredPageRequestHandlerTests.cs       | 0
 .../ServerHandlers/StaticFileRequestHandlerTests.cs           | 0
 {test => Tests}/TestSetup.cs                                  | 4 ++--
 test/test.csproj => Tests/Tests.csproj                        | 2 ++
 source/AssemblyInfo.cs                                        | 2 +-
 155 files changed, 8 insertions(+), 6 deletions(-)
 rename {test => Tests}/.TestSites/01/content/categories.md (100%)
 rename {test => Tests}/.TestSites/01/content/date-future.md (100%)
 rename {test => Tests}/.TestSites/01/content/date-ok.md (100%)
 rename {test => Tests}/.TestSites/01/content/expired.md (100%)
 rename {test => Tests}/.TestSites/01/content/publishdate-future.md (100%)
 rename {test => Tests}/.TestSites/01/content/publishdate-ok.md (100%)
 rename {test => Tests}/.TestSites/01/content/test01.md (100%)
 rename {test => Tests}/.TestSites/01/sucos.yaml (100%)
 rename {test => Tests}/.TestSites/02-have-index/content/alias.md (100%)
 rename {test => Tests}/.TestSites/02-have-index/content/categories.md (100%)
 rename {test => Tests}/.TestSites/02-have-index/content/date-future.md (100%)
 rename {test => Tests}/.TestSites/02-have-index/content/date-ok.md (100%)
 rename {test => Tests}/.TestSites/02-have-index/content/expired.md (100%)
 rename {test => Tests}/.TestSites/02-have-index/content/index.md (100%)
 rename {test => Tests}/.TestSites/02-have-index/content/publishdate-future.md (100%)
 rename {test => Tests}/.TestSites/02-have-index/content/publishdate-ok.md (100%)
 rename {test => Tests}/.TestSites/02-have-index/content/test01.md (100%)
 rename {test => Tests}/.TestSites/02-have-index/sucos.yaml (100%)
 rename {test => Tests}/.TestSites/03-section/content/blog/alias.md (100%)
 rename {test => Tests}/.TestSites/03-section/content/blog/categories.md (100%)
 rename {test => Tests}/.TestSites/03-section/content/blog/date-future.md (100%)
 rename {test => Tests}/.TestSites/03-section/content/blog/date-ok.md (100%)
 rename {test => Tests}/.TestSites/03-section/content/blog/expired.md (100%)
 rename {test => Tests}/.TestSites/03-section/content/blog/publishdate-future.md (100%)
 rename {test => Tests}/.TestSites/03-section/content/blog/publishdate-ok.md (100%)
 rename {test => Tests}/.TestSites/03-section/content/blog/test01.md (100%)
 rename {test => Tests}/.TestSites/03-section/content/blog/weight-negative-1.md (100%)
 rename {test => Tests}/.TestSites/03-section/content/blog/weight-negative-100.md (100%)
 rename {test => Tests}/.TestSites/03-section/content/blog/weight-positive-1.md (100%)
 rename {test => Tests}/.TestSites/03-section/content/blog/weight-positive-100.md (100%)
 rename {test => Tests}/.TestSites/03-section/sucos.yaml (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/categories.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/date-future.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/date-ok.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/expired.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/publishdate-future.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/publishdate-ok.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/subsection/alias.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/tags-01.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/tags-02.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/tags-03.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/tags-04.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/tags-05.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/tags-06.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/tags-07.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/tags-08.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/tags-09.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/tags-10.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/test01.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/weight-negative-1.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/weight-negative-100.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/weight-positive-1.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/blog/weight-positive-100.md (100%)
 rename {test => Tests}/.TestSites/04-tags/content/index.md (100%)
 rename {test => Tests}/.TestSites/04-tags/sucos.yaml (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/alias.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/categories.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/date-future.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/date-ok.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/expired.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/publishdate-future.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/publishdate-ok.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/tags-01.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/tags-02.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/test01.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/weight-negative-1.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/weight-negative-100.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/weight-positive-1.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/blog/weight-positive-100.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/content/index.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/index.md (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/sucos.yaml (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/themes/test/_default/index.liquid (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/themes/test/_default/list.liquid (100%)
 rename {test => Tests}/.TestSites/05-theme-no-baseof/themes/test/_default/single.liquid (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/alias.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/categories.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/date-future.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/date-ok.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/expired.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/publishdate-future.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/publishdate-ok.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/tags-01.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/tags-02.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/test01.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/weight-negative-1.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/weight-negative-100.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/weight-positive-1.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/blog/weight-positive-100.md (100%)
 rename {test => Tests}/.TestSites/06-theme/content/index.md (100%)
 rename {test => Tests}/.TestSites/06-theme/index.md (100%)
 rename {test => Tests}/.TestSites/06-theme/sucos.yaml (100%)
 rename {test => Tests}/.TestSites/06-theme/themes/test/_default/baseof.liquid (100%)
 rename {test => Tests}/.TestSites/06-theme/themes/test/_default/index.liquid (100%)
 rename {test => Tests}/.TestSites/06-theme/themes/test/_default/list.liquid (100%)
 rename {test => Tests}/.TestSites/06-theme/themes/test/_default/single.liquid (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/alias.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/categories.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/date-future.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/date-ok.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/expired.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-future.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-ok.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/tags-01.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/tags-02.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/test01.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-1.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-100.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-1.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-100.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/content/index.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/index.md (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/sucos.yaml (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/themes/test/_default/index.liquid (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/themes/test/_default/list.liquid (100%)
 rename {test => Tests}/.TestSites/07-theme-no-baseof-error/themes/test/_default/single.liquid (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/alias.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/categories.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/date-future.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/date-ok.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/expired.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/publishdate-future.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/publishdate-ok.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/tags-01.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/tags-02.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/test01.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/weight-negative-1.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/weight-negative-100.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/weight-positive-1.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/blog/weight-positive-100.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/content/index.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/index.md (100%)
 rename {test => Tests}/.TestSites/08-theme-html/sucos.yaml (100%)
 rename {test => Tests}/.TestSites/08-theme-html/themes/test/_default/baseof.liquid (100%)
 rename {test => Tests}/.TestSites/08-theme-html/themes/test/_default/index.liquid (100%)
 rename {test => Tests}/.TestSites/08-theme-html/themes/test/_default/list.liquid (100%)
 rename {test => Tests}/.TestSites/08-theme-html/themes/test/_default/single.liquid (100%)
 rename {test => Tests}/Commands/BaseGeneratorCommandTests.cs (100%)
 rename {test => Tests}/Commands/BuildCommandTests.cs (100%)
 rename {test => Tests}/Commands/NewSiteCommandTests.cs (100%)
 rename {test => Tests}/Helpers/StopwatchReporterTests.cs (100%)
 rename {test => Tests}/Helpers/UrlizerTests.cs (100%)
 rename {test => Tests}/Models/FrontMatterTests.cs (100%)
 rename {test => Tests}/Models/PageTests.cs (100%)
 rename {test => Tests}/Models/SiteTests.cs (100%)
 rename {test => Tests}/Parser/YAMLParserTests.cs (100%)
 rename {test => Tests}/ProgramTest.cs (100%)
 rename {test => Tests}/ServerHandlers/PingRequestHandlerTests.cs (100%)
 rename {test => Tests}/ServerHandlers/RegisteredPageRequestHandlerTests.cs (100%)
 rename {test => Tests}/ServerHandlers/StaticFileRequestHandlerTests.cs (100%)
 rename {test => Tests}/TestSetup.cs (95%)
 rename test/test.csproj => Tests/Tests.csproj (93%)

diff --git a/.nuke/Build.Test.cs b/.nuke/Build.Test.cs
index c525413..6570230 100644
--- a/.nuke/Build.Test.cs
+++ b/.nuke/Build.Test.cs
@@ -17,9 +17,9 @@ namespace SuCoS.Nuke;
 /// </summary>
 sealed partial class Build : NukeBuild
 {
-    static AbsolutePath testDirectory => RootDirectory / "test";
+    static AbsolutePath testDirectory => RootDirectory / "Tests";
     static AbsolutePath testDLLDirectory => testDirectory / "bin" / "Debug" / "net8.0";
-    static AbsolutePath testAssembly => testDLLDirectory / "test.dll";
+    static AbsolutePath testAssembly => testDLLDirectory / "Tests.dll";
     static AbsolutePath coverageDirectory => RootDirectory / "coverage-results";
     static AbsolutePath coverageResultDirectory => coverageDirectory / "coverage";
     static AbsolutePath coverageResultFile => coverageResultDirectory / "coverage.xml";
diff --git a/SuCoS.sln b/SuCoS.sln
index 0974c4c..49c59b3 100644
--- a/SuCoS.sln
+++ b/SuCoS.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SuCoS", "source\SuCoS.cspro
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_nuke", ".nuke\_nuke.csproj", "{26DB04F6-DA88-43D7-8F4B-535D4D68C24E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "test\test.csproj", "{F3D789FD-6AC5-4A45-B9AC-079035F5909C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{F3D789FD-6AC5-4A45-B9AC-079035F5909C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/test/.TestSites/01/content/categories.md b/Tests/.TestSites/01/content/categories.md
similarity index 100%
rename from test/.TestSites/01/content/categories.md
rename to Tests/.TestSites/01/content/categories.md
diff --git a/test/.TestSites/01/content/date-future.md b/Tests/.TestSites/01/content/date-future.md
similarity index 100%
rename from test/.TestSites/01/content/date-future.md
rename to Tests/.TestSites/01/content/date-future.md
diff --git a/test/.TestSites/01/content/date-ok.md b/Tests/.TestSites/01/content/date-ok.md
similarity index 100%
rename from test/.TestSites/01/content/date-ok.md
rename to Tests/.TestSites/01/content/date-ok.md
diff --git a/test/.TestSites/01/content/expired.md b/Tests/.TestSites/01/content/expired.md
similarity index 100%
rename from test/.TestSites/01/content/expired.md
rename to Tests/.TestSites/01/content/expired.md
diff --git a/test/.TestSites/01/content/publishdate-future.md b/Tests/.TestSites/01/content/publishdate-future.md
similarity index 100%
rename from test/.TestSites/01/content/publishdate-future.md
rename to Tests/.TestSites/01/content/publishdate-future.md
diff --git a/test/.TestSites/01/content/publishdate-ok.md b/Tests/.TestSites/01/content/publishdate-ok.md
similarity index 100%
rename from test/.TestSites/01/content/publishdate-ok.md
rename to Tests/.TestSites/01/content/publishdate-ok.md
diff --git a/test/.TestSites/01/content/test01.md b/Tests/.TestSites/01/content/test01.md
similarity index 100%
rename from test/.TestSites/01/content/test01.md
rename to Tests/.TestSites/01/content/test01.md
diff --git a/test/.TestSites/01/sucos.yaml b/Tests/.TestSites/01/sucos.yaml
similarity index 100%
rename from test/.TestSites/01/sucos.yaml
rename to Tests/.TestSites/01/sucos.yaml
diff --git a/test/.TestSites/02-have-index/content/alias.md b/Tests/.TestSites/02-have-index/content/alias.md
similarity index 100%
rename from test/.TestSites/02-have-index/content/alias.md
rename to Tests/.TestSites/02-have-index/content/alias.md
diff --git a/test/.TestSites/02-have-index/content/categories.md b/Tests/.TestSites/02-have-index/content/categories.md
similarity index 100%
rename from test/.TestSites/02-have-index/content/categories.md
rename to Tests/.TestSites/02-have-index/content/categories.md
diff --git a/test/.TestSites/02-have-index/content/date-future.md b/Tests/.TestSites/02-have-index/content/date-future.md
similarity index 100%
rename from test/.TestSites/02-have-index/content/date-future.md
rename to Tests/.TestSites/02-have-index/content/date-future.md
diff --git a/test/.TestSites/02-have-index/content/date-ok.md b/Tests/.TestSites/02-have-index/content/date-ok.md
similarity index 100%
rename from test/.TestSites/02-have-index/content/date-ok.md
rename to Tests/.TestSites/02-have-index/content/date-ok.md
diff --git a/test/.TestSites/02-have-index/content/expired.md b/Tests/.TestSites/02-have-index/content/expired.md
similarity index 100%
rename from test/.TestSites/02-have-index/content/expired.md
rename to Tests/.TestSites/02-have-index/content/expired.md
diff --git a/test/.TestSites/02-have-index/content/index.md b/Tests/.TestSites/02-have-index/content/index.md
similarity index 100%
rename from test/.TestSites/02-have-index/content/index.md
rename to Tests/.TestSites/02-have-index/content/index.md
diff --git a/test/.TestSites/02-have-index/content/publishdate-future.md b/Tests/.TestSites/02-have-index/content/publishdate-future.md
similarity index 100%
rename from test/.TestSites/02-have-index/content/publishdate-future.md
rename to Tests/.TestSites/02-have-index/content/publishdate-future.md
diff --git a/test/.TestSites/02-have-index/content/publishdate-ok.md b/Tests/.TestSites/02-have-index/content/publishdate-ok.md
similarity index 100%
rename from test/.TestSites/02-have-index/content/publishdate-ok.md
rename to Tests/.TestSites/02-have-index/content/publishdate-ok.md
diff --git a/test/.TestSites/02-have-index/content/test01.md b/Tests/.TestSites/02-have-index/content/test01.md
similarity index 100%
rename from test/.TestSites/02-have-index/content/test01.md
rename to Tests/.TestSites/02-have-index/content/test01.md
diff --git a/test/.TestSites/02-have-index/sucos.yaml b/Tests/.TestSites/02-have-index/sucos.yaml
similarity index 100%
rename from test/.TestSites/02-have-index/sucos.yaml
rename to Tests/.TestSites/02-have-index/sucos.yaml
diff --git a/test/.TestSites/03-section/content/blog/alias.md b/Tests/.TestSites/03-section/content/blog/alias.md
similarity index 100%
rename from test/.TestSites/03-section/content/blog/alias.md
rename to Tests/.TestSites/03-section/content/blog/alias.md
diff --git a/test/.TestSites/03-section/content/blog/categories.md b/Tests/.TestSites/03-section/content/blog/categories.md
similarity index 100%
rename from test/.TestSites/03-section/content/blog/categories.md
rename to Tests/.TestSites/03-section/content/blog/categories.md
diff --git a/test/.TestSites/03-section/content/blog/date-future.md b/Tests/.TestSites/03-section/content/blog/date-future.md
similarity index 100%
rename from test/.TestSites/03-section/content/blog/date-future.md
rename to Tests/.TestSites/03-section/content/blog/date-future.md
diff --git a/test/.TestSites/03-section/content/blog/date-ok.md b/Tests/.TestSites/03-section/content/blog/date-ok.md
similarity index 100%
rename from test/.TestSites/03-section/content/blog/date-ok.md
rename to Tests/.TestSites/03-section/content/blog/date-ok.md
diff --git a/test/.TestSites/03-section/content/blog/expired.md b/Tests/.TestSites/03-section/content/blog/expired.md
similarity index 100%
rename from test/.TestSites/03-section/content/blog/expired.md
rename to Tests/.TestSites/03-section/content/blog/expired.md
diff --git a/test/.TestSites/03-section/content/blog/publishdate-future.md b/Tests/.TestSites/03-section/content/blog/publishdate-future.md
similarity index 100%
rename from test/.TestSites/03-section/content/blog/publishdate-future.md
rename to Tests/.TestSites/03-section/content/blog/publishdate-future.md
diff --git a/test/.TestSites/03-section/content/blog/publishdate-ok.md b/Tests/.TestSites/03-section/content/blog/publishdate-ok.md
similarity index 100%
rename from test/.TestSites/03-section/content/blog/publishdate-ok.md
rename to Tests/.TestSites/03-section/content/blog/publishdate-ok.md
diff --git a/test/.TestSites/03-section/content/blog/test01.md b/Tests/.TestSites/03-section/content/blog/test01.md
similarity index 100%
rename from test/.TestSites/03-section/content/blog/test01.md
rename to Tests/.TestSites/03-section/content/blog/test01.md
diff --git a/test/.TestSites/03-section/content/blog/weight-negative-1.md b/Tests/.TestSites/03-section/content/blog/weight-negative-1.md
similarity index 100%
rename from test/.TestSites/03-section/content/blog/weight-negative-1.md
rename to Tests/.TestSites/03-section/content/blog/weight-negative-1.md
diff --git a/test/.TestSites/03-section/content/blog/weight-negative-100.md b/Tests/.TestSites/03-section/content/blog/weight-negative-100.md
similarity index 100%
rename from test/.TestSites/03-section/content/blog/weight-negative-100.md
rename to Tests/.TestSites/03-section/content/blog/weight-negative-100.md
diff --git a/test/.TestSites/03-section/content/blog/weight-positive-1.md b/Tests/.TestSites/03-section/content/blog/weight-positive-1.md
similarity index 100%
rename from test/.TestSites/03-section/content/blog/weight-positive-1.md
rename to Tests/.TestSites/03-section/content/blog/weight-positive-1.md
diff --git a/test/.TestSites/03-section/content/blog/weight-positive-100.md b/Tests/.TestSites/03-section/content/blog/weight-positive-100.md
similarity index 100%
rename from test/.TestSites/03-section/content/blog/weight-positive-100.md
rename to Tests/.TestSites/03-section/content/blog/weight-positive-100.md
diff --git a/test/.TestSites/03-section/sucos.yaml b/Tests/.TestSites/03-section/sucos.yaml
similarity index 100%
rename from test/.TestSites/03-section/sucos.yaml
rename to Tests/.TestSites/03-section/sucos.yaml
diff --git a/test/.TestSites/04-tags/content/blog/categories.md b/Tests/.TestSites/04-tags/content/blog/categories.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/categories.md
rename to Tests/.TestSites/04-tags/content/blog/categories.md
diff --git a/test/.TestSites/04-tags/content/blog/date-future.md b/Tests/.TestSites/04-tags/content/blog/date-future.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/date-future.md
rename to Tests/.TestSites/04-tags/content/blog/date-future.md
diff --git a/test/.TestSites/04-tags/content/blog/date-ok.md b/Tests/.TestSites/04-tags/content/blog/date-ok.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/date-ok.md
rename to Tests/.TestSites/04-tags/content/blog/date-ok.md
diff --git a/test/.TestSites/04-tags/content/blog/expired.md b/Tests/.TestSites/04-tags/content/blog/expired.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/expired.md
rename to Tests/.TestSites/04-tags/content/blog/expired.md
diff --git a/test/.TestSites/04-tags/content/blog/publishdate-future.md b/Tests/.TestSites/04-tags/content/blog/publishdate-future.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/publishdate-future.md
rename to Tests/.TestSites/04-tags/content/blog/publishdate-future.md
diff --git a/test/.TestSites/04-tags/content/blog/publishdate-ok.md b/Tests/.TestSites/04-tags/content/blog/publishdate-ok.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/publishdate-ok.md
rename to Tests/.TestSites/04-tags/content/blog/publishdate-ok.md
diff --git a/test/.TestSites/04-tags/content/blog/subsection/alias.md b/Tests/.TestSites/04-tags/content/blog/subsection/alias.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/subsection/alias.md
rename to Tests/.TestSites/04-tags/content/blog/subsection/alias.md
diff --git a/test/.TestSites/04-tags/content/blog/tags-01.md b/Tests/.TestSites/04-tags/content/blog/tags-01.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/tags-01.md
rename to Tests/.TestSites/04-tags/content/blog/tags-01.md
diff --git a/test/.TestSites/04-tags/content/blog/tags-02.md b/Tests/.TestSites/04-tags/content/blog/tags-02.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/tags-02.md
rename to Tests/.TestSites/04-tags/content/blog/tags-02.md
diff --git a/test/.TestSites/04-tags/content/blog/tags-03.md b/Tests/.TestSites/04-tags/content/blog/tags-03.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/tags-03.md
rename to Tests/.TestSites/04-tags/content/blog/tags-03.md
diff --git a/test/.TestSites/04-tags/content/blog/tags-04.md b/Tests/.TestSites/04-tags/content/blog/tags-04.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/tags-04.md
rename to Tests/.TestSites/04-tags/content/blog/tags-04.md
diff --git a/test/.TestSites/04-tags/content/blog/tags-05.md b/Tests/.TestSites/04-tags/content/blog/tags-05.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/tags-05.md
rename to Tests/.TestSites/04-tags/content/blog/tags-05.md
diff --git a/test/.TestSites/04-tags/content/blog/tags-06.md b/Tests/.TestSites/04-tags/content/blog/tags-06.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/tags-06.md
rename to Tests/.TestSites/04-tags/content/blog/tags-06.md
diff --git a/test/.TestSites/04-tags/content/blog/tags-07.md b/Tests/.TestSites/04-tags/content/blog/tags-07.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/tags-07.md
rename to Tests/.TestSites/04-tags/content/blog/tags-07.md
diff --git a/test/.TestSites/04-tags/content/blog/tags-08.md b/Tests/.TestSites/04-tags/content/blog/tags-08.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/tags-08.md
rename to Tests/.TestSites/04-tags/content/blog/tags-08.md
diff --git a/test/.TestSites/04-tags/content/blog/tags-09.md b/Tests/.TestSites/04-tags/content/blog/tags-09.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/tags-09.md
rename to Tests/.TestSites/04-tags/content/blog/tags-09.md
diff --git a/test/.TestSites/04-tags/content/blog/tags-10.md b/Tests/.TestSites/04-tags/content/blog/tags-10.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/tags-10.md
rename to Tests/.TestSites/04-tags/content/blog/tags-10.md
diff --git a/test/.TestSites/04-tags/content/blog/test01.md b/Tests/.TestSites/04-tags/content/blog/test01.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/test01.md
rename to Tests/.TestSites/04-tags/content/blog/test01.md
diff --git a/test/.TestSites/04-tags/content/blog/weight-negative-1.md b/Tests/.TestSites/04-tags/content/blog/weight-negative-1.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/weight-negative-1.md
rename to Tests/.TestSites/04-tags/content/blog/weight-negative-1.md
diff --git a/test/.TestSites/04-tags/content/blog/weight-negative-100.md b/Tests/.TestSites/04-tags/content/blog/weight-negative-100.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/weight-negative-100.md
rename to Tests/.TestSites/04-tags/content/blog/weight-negative-100.md
diff --git a/test/.TestSites/04-tags/content/blog/weight-positive-1.md b/Tests/.TestSites/04-tags/content/blog/weight-positive-1.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/weight-positive-1.md
rename to Tests/.TestSites/04-tags/content/blog/weight-positive-1.md
diff --git a/test/.TestSites/04-tags/content/blog/weight-positive-100.md b/Tests/.TestSites/04-tags/content/blog/weight-positive-100.md
similarity index 100%
rename from test/.TestSites/04-tags/content/blog/weight-positive-100.md
rename to Tests/.TestSites/04-tags/content/blog/weight-positive-100.md
diff --git a/test/.TestSites/04-tags/content/index.md b/Tests/.TestSites/04-tags/content/index.md
similarity index 100%
rename from test/.TestSites/04-tags/content/index.md
rename to Tests/.TestSites/04-tags/content/index.md
diff --git a/test/.TestSites/04-tags/sucos.yaml b/Tests/.TestSites/04-tags/sucos.yaml
similarity index 100%
rename from test/.TestSites/04-tags/sucos.yaml
rename to Tests/.TestSites/04-tags/sucos.yaml
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/alias.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/alias.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/alias.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/alias.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/categories.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/categories.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/categories.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/categories.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/date-future.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/date-future.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/date-future.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/date-future.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/date-ok.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/date-ok.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/date-ok.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/date-ok.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/expired.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/expired.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/expired.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/expired.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/publishdate-future.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/publishdate-future.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/publishdate-future.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/publishdate-future.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/publishdate-ok.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/publishdate-ok.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/publishdate-ok.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/publishdate-ok.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/tags-01.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/tags-01.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/tags-01.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/tags-01.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/tags-02.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/tags-02.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/tags-02.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/tags-02.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/test01.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/test01.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/test01.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/test01.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/weight-negative-1.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/weight-negative-1.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/weight-negative-1.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/weight-negative-1.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/weight-negative-100.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/weight-negative-100.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/weight-negative-100.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/weight-negative-100.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/weight-positive-1.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/weight-positive-1.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/weight-positive-1.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/weight-positive-1.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/blog/weight-positive-100.md b/Tests/.TestSites/05-theme-no-baseof/content/blog/weight-positive-100.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/blog/weight-positive-100.md
rename to Tests/.TestSites/05-theme-no-baseof/content/blog/weight-positive-100.md
diff --git a/test/.TestSites/05-theme-no-baseof/content/index.md b/Tests/.TestSites/05-theme-no-baseof/content/index.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/content/index.md
rename to Tests/.TestSites/05-theme-no-baseof/content/index.md
diff --git a/test/.TestSites/05-theme-no-baseof/index.md b/Tests/.TestSites/05-theme-no-baseof/index.md
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/index.md
rename to Tests/.TestSites/05-theme-no-baseof/index.md
diff --git a/test/.TestSites/05-theme-no-baseof/sucos.yaml b/Tests/.TestSites/05-theme-no-baseof/sucos.yaml
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/sucos.yaml
rename to Tests/.TestSites/05-theme-no-baseof/sucos.yaml
diff --git a/test/.TestSites/05-theme-no-baseof/themes/test/_default/index.liquid b/Tests/.TestSites/05-theme-no-baseof/themes/test/_default/index.liquid
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/themes/test/_default/index.liquid
rename to Tests/.TestSites/05-theme-no-baseof/themes/test/_default/index.liquid
diff --git a/test/.TestSites/05-theme-no-baseof/themes/test/_default/list.liquid b/Tests/.TestSites/05-theme-no-baseof/themes/test/_default/list.liquid
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/themes/test/_default/list.liquid
rename to Tests/.TestSites/05-theme-no-baseof/themes/test/_default/list.liquid
diff --git a/test/.TestSites/05-theme-no-baseof/themes/test/_default/single.liquid b/Tests/.TestSites/05-theme-no-baseof/themes/test/_default/single.liquid
similarity index 100%
rename from test/.TestSites/05-theme-no-baseof/themes/test/_default/single.liquid
rename to Tests/.TestSites/05-theme-no-baseof/themes/test/_default/single.liquid
diff --git a/test/.TestSites/06-theme/content/blog/alias.md b/Tests/.TestSites/06-theme/content/blog/alias.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/alias.md
rename to Tests/.TestSites/06-theme/content/blog/alias.md
diff --git a/test/.TestSites/06-theme/content/blog/categories.md b/Tests/.TestSites/06-theme/content/blog/categories.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/categories.md
rename to Tests/.TestSites/06-theme/content/blog/categories.md
diff --git a/test/.TestSites/06-theme/content/blog/date-future.md b/Tests/.TestSites/06-theme/content/blog/date-future.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/date-future.md
rename to Tests/.TestSites/06-theme/content/blog/date-future.md
diff --git a/test/.TestSites/06-theme/content/blog/date-ok.md b/Tests/.TestSites/06-theme/content/blog/date-ok.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/date-ok.md
rename to Tests/.TestSites/06-theme/content/blog/date-ok.md
diff --git a/test/.TestSites/06-theme/content/blog/expired.md b/Tests/.TestSites/06-theme/content/blog/expired.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/expired.md
rename to Tests/.TestSites/06-theme/content/blog/expired.md
diff --git a/test/.TestSites/06-theme/content/blog/publishdate-future.md b/Tests/.TestSites/06-theme/content/blog/publishdate-future.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/publishdate-future.md
rename to Tests/.TestSites/06-theme/content/blog/publishdate-future.md
diff --git a/test/.TestSites/06-theme/content/blog/publishdate-ok.md b/Tests/.TestSites/06-theme/content/blog/publishdate-ok.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/publishdate-ok.md
rename to Tests/.TestSites/06-theme/content/blog/publishdate-ok.md
diff --git a/test/.TestSites/06-theme/content/blog/tags-01.md b/Tests/.TestSites/06-theme/content/blog/tags-01.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/tags-01.md
rename to Tests/.TestSites/06-theme/content/blog/tags-01.md
diff --git a/test/.TestSites/06-theme/content/blog/tags-02.md b/Tests/.TestSites/06-theme/content/blog/tags-02.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/tags-02.md
rename to Tests/.TestSites/06-theme/content/blog/tags-02.md
diff --git a/test/.TestSites/06-theme/content/blog/test01.md b/Tests/.TestSites/06-theme/content/blog/test01.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/test01.md
rename to Tests/.TestSites/06-theme/content/blog/test01.md
diff --git a/test/.TestSites/06-theme/content/blog/weight-negative-1.md b/Tests/.TestSites/06-theme/content/blog/weight-negative-1.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/weight-negative-1.md
rename to Tests/.TestSites/06-theme/content/blog/weight-negative-1.md
diff --git a/test/.TestSites/06-theme/content/blog/weight-negative-100.md b/Tests/.TestSites/06-theme/content/blog/weight-negative-100.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/weight-negative-100.md
rename to Tests/.TestSites/06-theme/content/blog/weight-negative-100.md
diff --git a/test/.TestSites/06-theme/content/blog/weight-positive-1.md b/Tests/.TestSites/06-theme/content/blog/weight-positive-1.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/weight-positive-1.md
rename to Tests/.TestSites/06-theme/content/blog/weight-positive-1.md
diff --git a/test/.TestSites/06-theme/content/blog/weight-positive-100.md b/Tests/.TestSites/06-theme/content/blog/weight-positive-100.md
similarity index 100%
rename from test/.TestSites/06-theme/content/blog/weight-positive-100.md
rename to Tests/.TestSites/06-theme/content/blog/weight-positive-100.md
diff --git a/test/.TestSites/06-theme/content/index.md b/Tests/.TestSites/06-theme/content/index.md
similarity index 100%
rename from test/.TestSites/06-theme/content/index.md
rename to Tests/.TestSites/06-theme/content/index.md
diff --git a/test/.TestSites/06-theme/index.md b/Tests/.TestSites/06-theme/index.md
similarity index 100%
rename from test/.TestSites/06-theme/index.md
rename to Tests/.TestSites/06-theme/index.md
diff --git a/test/.TestSites/06-theme/sucos.yaml b/Tests/.TestSites/06-theme/sucos.yaml
similarity index 100%
rename from test/.TestSites/06-theme/sucos.yaml
rename to Tests/.TestSites/06-theme/sucos.yaml
diff --git a/test/.TestSites/06-theme/themes/test/_default/baseof.liquid b/Tests/.TestSites/06-theme/themes/test/_default/baseof.liquid
similarity index 100%
rename from test/.TestSites/06-theme/themes/test/_default/baseof.liquid
rename to Tests/.TestSites/06-theme/themes/test/_default/baseof.liquid
diff --git a/test/.TestSites/06-theme/themes/test/_default/index.liquid b/Tests/.TestSites/06-theme/themes/test/_default/index.liquid
similarity index 100%
rename from test/.TestSites/06-theme/themes/test/_default/index.liquid
rename to Tests/.TestSites/06-theme/themes/test/_default/index.liquid
diff --git a/test/.TestSites/06-theme/themes/test/_default/list.liquid b/Tests/.TestSites/06-theme/themes/test/_default/list.liquid
similarity index 100%
rename from test/.TestSites/06-theme/themes/test/_default/list.liquid
rename to Tests/.TestSites/06-theme/themes/test/_default/list.liquid
diff --git a/test/.TestSites/06-theme/themes/test/_default/single.liquid b/Tests/.TestSites/06-theme/themes/test/_default/single.liquid
similarity index 100%
rename from test/.TestSites/06-theme/themes/test/_default/single.liquid
rename to Tests/.TestSites/06-theme/themes/test/_default/single.liquid
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/alias.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/alias.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/alias.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/alias.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/categories.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/categories.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/categories.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/categories.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/date-future.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/date-future.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/date-future.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/date-future.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/date-ok.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/date-ok.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/date-ok.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/date-ok.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/expired.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/expired.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/expired.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/expired.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-future.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-future.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-future.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-future.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-ok.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-ok.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-ok.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-ok.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/tags-01.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/tags-01.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/tags-01.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/tags-01.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/tags-02.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/tags-02.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/tags-02.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/tags-02.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/test01.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/test01.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/test01.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/test01.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-1.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-1.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-1.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-1.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-100.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-100.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-100.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-100.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-1.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-1.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-1.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-1.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-100.md b/Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-100.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-100.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-100.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/content/index.md b/Tests/.TestSites/07-theme-no-baseof-error/content/index.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/content/index.md
rename to Tests/.TestSites/07-theme-no-baseof-error/content/index.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/index.md b/Tests/.TestSites/07-theme-no-baseof-error/index.md
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/index.md
rename to Tests/.TestSites/07-theme-no-baseof-error/index.md
diff --git a/test/.TestSites/07-theme-no-baseof-error/sucos.yaml b/Tests/.TestSites/07-theme-no-baseof-error/sucos.yaml
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/sucos.yaml
rename to Tests/.TestSites/07-theme-no-baseof-error/sucos.yaml
diff --git a/test/.TestSites/07-theme-no-baseof-error/themes/test/_default/index.liquid b/Tests/.TestSites/07-theme-no-baseof-error/themes/test/_default/index.liquid
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/themes/test/_default/index.liquid
rename to Tests/.TestSites/07-theme-no-baseof-error/themes/test/_default/index.liquid
diff --git a/test/.TestSites/07-theme-no-baseof-error/themes/test/_default/list.liquid b/Tests/.TestSites/07-theme-no-baseof-error/themes/test/_default/list.liquid
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/themes/test/_default/list.liquid
rename to Tests/.TestSites/07-theme-no-baseof-error/themes/test/_default/list.liquid
diff --git a/test/.TestSites/07-theme-no-baseof-error/themes/test/_default/single.liquid b/Tests/.TestSites/07-theme-no-baseof-error/themes/test/_default/single.liquid
similarity index 100%
rename from test/.TestSites/07-theme-no-baseof-error/themes/test/_default/single.liquid
rename to Tests/.TestSites/07-theme-no-baseof-error/themes/test/_default/single.liquid
diff --git a/test/.TestSites/08-theme-html/content/blog/alias.md b/Tests/.TestSites/08-theme-html/content/blog/alias.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/alias.md
rename to Tests/.TestSites/08-theme-html/content/blog/alias.md
diff --git a/test/.TestSites/08-theme-html/content/blog/categories.md b/Tests/.TestSites/08-theme-html/content/blog/categories.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/categories.md
rename to Tests/.TestSites/08-theme-html/content/blog/categories.md
diff --git a/test/.TestSites/08-theme-html/content/blog/date-future.md b/Tests/.TestSites/08-theme-html/content/blog/date-future.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/date-future.md
rename to Tests/.TestSites/08-theme-html/content/blog/date-future.md
diff --git a/test/.TestSites/08-theme-html/content/blog/date-ok.md b/Tests/.TestSites/08-theme-html/content/blog/date-ok.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/date-ok.md
rename to Tests/.TestSites/08-theme-html/content/blog/date-ok.md
diff --git a/test/.TestSites/08-theme-html/content/blog/expired.md b/Tests/.TestSites/08-theme-html/content/blog/expired.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/expired.md
rename to Tests/.TestSites/08-theme-html/content/blog/expired.md
diff --git a/test/.TestSites/08-theme-html/content/blog/publishdate-future.md b/Tests/.TestSites/08-theme-html/content/blog/publishdate-future.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/publishdate-future.md
rename to Tests/.TestSites/08-theme-html/content/blog/publishdate-future.md
diff --git a/test/.TestSites/08-theme-html/content/blog/publishdate-ok.md b/Tests/.TestSites/08-theme-html/content/blog/publishdate-ok.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/publishdate-ok.md
rename to Tests/.TestSites/08-theme-html/content/blog/publishdate-ok.md
diff --git a/test/.TestSites/08-theme-html/content/blog/tags-01.md b/Tests/.TestSites/08-theme-html/content/blog/tags-01.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/tags-01.md
rename to Tests/.TestSites/08-theme-html/content/blog/tags-01.md
diff --git a/test/.TestSites/08-theme-html/content/blog/tags-02.md b/Tests/.TestSites/08-theme-html/content/blog/tags-02.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/tags-02.md
rename to Tests/.TestSites/08-theme-html/content/blog/tags-02.md
diff --git a/test/.TestSites/08-theme-html/content/blog/test01.md b/Tests/.TestSites/08-theme-html/content/blog/test01.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/test01.md
rename to Tests/.TestSites/08-theme-html/content/blog/test01.md
diff --git a/test/.TestSites/08-theme-html/content/blog/weight-negative-1.md b/Tests/.TestSites/08-theme-html/content/blog/weight-negative-1.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/weight-negative-1.md
rename to Tests/.TestSites/08-theme-html/content/blog/weight-negative-1.md
diff --git a/test/.TestSites/08-theme-html/content/blog/weight-negative-100.md b/Tests/.TestSites/08-theme-html/content/blog/weight-negative-100.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/weight-negative-100.md
rename to Tests/.TestSites/08-theme-html/content/blog/weight-negative-100.md
diff --git a/test/.TestSites/08-theme-html/content/blog/weight-positive-1.md b/Tests/.TestSites/08-theme-html/content/blog/weight-positive-1.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/weight-positive-1.md
rename to Tests/.TestSites/08-theme-html/content/blog/weight-positive-1.md
diff --git a/test/.TestSites/08-theme-html/content/blog/weight-positive-100.md b/Tests/.TestSites/08-theme-html/content/blog/weight-positive-100.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/blog/weight-positive-100.md
rename to Tests/.TestSites/08-theme-html/content/blog/weight-positive-100.md
diff --git a/test/.TestSites/08-theme-html/content/index.md b/Tests/.TestSites/08-theme-html/content/index.md
similarity index 100%
rename from test/.TestSites/08-theme-html/content/index.md
rename to Tests/.TestSites/08-theme-html/content/index.md
diff --git a/test/.TestSites/08-theme-html/index.md b/Tests/.TestSites/08-theme-html/index.md
similarity index 100%
rename from test/.TestSites/08-theme-html/index.md
rename to Tests/.TestSites/08-theme-html/index.md
diff --git a/test/.TestSites/08-theme-html/sucos.yaml b/Tests/.TestSites/08-theme-html/sucos.yaml
similarity index 100%
rename from test/.TestSites/08-theme-html/sucos.yaml
rename to Tests/.TestSites/08-theme-html/sucos.yaml
diff --git a/test/.TestSites/08-theme-html/themes/test/_default/baseof.liquid b/Tests/.TestSites/08-theme-html/themes/test/_default/baseof.liquid
similarity index 100%
rename from test/.TestSites/08-theme-html/themes/test/_default/baseof.liquid
rename to Tests/.TestSites/08-theme-html/themes/test/_default/baseof.liquid
diff --git a/test/.TestSites/08-theme-html/themes/test/_default/index.liquid b/Tests/.TestSites/08-theme-html/themes/test/_default/index.liquid
similarity index 100%
rename from test/.TestSites/08-theme-html/themes/test/_default/index.liquid
rename to Tests/.TestSites/08-theme-html/themes/test/_default/index.liquid
diff --git a/test/.TestSites/08-theme-html/themes/test/_default/list.liquid b/Tests/.TestSites/08-theme-html/themes/test/_default/list.liquid
similarity index 100%
rename from test/.TestSites/08-theme-html/themes/test/_default/list.liquid
rename to Tests/.TestSites/08-theme-html/themes/test/_default/list.liquid
diff --git a/test/.TestSites/08-theme-html/themes/test/_default/single.liquid b/Tests/.TestSites/08-theme-html/themes/test/_default/single.liquid
similarity index 100%
rename from test/.TestSites/08-theme-html/themes/test/_default/single.liquid
rename to Tests/.TestSites/08-theme-html/themes/test/_default/single.liquid
diff --git a/test/Commands/BaseGeneratorCommandTests.cs b/Tests/Commands/BaseGeneratorCommandTests.cs
similarity index 100%
rename from test/Commands/BaseGeneratorCommandTests.cs
rename to Tests/Commands/BaseGeneratorCommandTests.cs
diff --git a/test/Commands/BuildCommandTests.cs b/Tests/Commands/BuildCommandTests.cs
similarity index 100%
rename from test/Commands/BuildCommandTests.cs
rename to Tests/Commands/BuildCommandTests.cs
diff --git a/test/Commands/NewSiteCommandTests.cs b/Tests/Commands/NewSiteCommandTests.cs
similarity index 100%
rename from test/Commands/NewSiteCommandTests.cs
rename to Tests/Commands/NewSiteCommandTests.cs
diff --git a/test/Helpers/StopwatchReporterTests.cs b/Tests/Helpers/StopwatchReporterTests.cs
similarity index 100%
rename from test/Helpers/StopwatchReporterTests.cs
rename to Tests/Helpers/StopwatchReporterTests.cs
diff --git a/test/Helpers/UrlizerTests.cs b/Tests/Helpers/UrlizerTests.cs
similarity index 100%
rename from test/Helpers/UrlizerTests.cs
rename to Tests/Helpers/UrlizerTests.cs
diff --git a/test/Models/FrontMatterTests.cs b/Tests/Models/FrontMatterTests.cs
similarity index 100%
rename from test/Models/FrontMatterTests.cs
rename to Tests/Models/FrontMatterTests.cs
diff --git a/test/Models/PageTests.cs b/Tests/Models/PageTests.cs
similarity index 100%
rename from test/Models/PageTests.cs
rename to Tests/Models/PageTests.cs
diff --git a/test/Models/SiteTests.cs b/Tests/Models/SiteTests.cs
similarity index 100%
rename from test/Models/SiteTests.cs
rename to Tests/Models/SiteTests.cs
diff --git a/test/Parser/YAMLParserTests.cs b/Tests/Parser/YAMLParserTests.cs
similarity index 100%
rename from test/Parser/YAMLParserTests.cs
rename to Tests/Parser/YAMLParserTests.cs
diff --git a/test/ProgramTest.cs b/Tests/ProgramTest.cs
similarity index 100%
rename from test/ProgramTest.cs
rename to Tests/ProgramTest.cs
diff --git a/test/ServerHandlers/PingRequestHandlerTests.cs b/Tests/ServerHandlers/PingRequestHandlerTests.cs
similarity index 100%
rename from test/ServerHandlers/PingRequestHandlerTests.cs
rename to Tests/ServerHandlers/PingRequestHandlerTests.cs
diff --git a/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs b/Tests/ServerHandlers/RegisteredPageRequestHandlerTests.cs
similarity index 100%
rename from test/ServerHandlers/RegisteredPageRequestHandlerTests.cs
rename to Tests/ServerHandlers/RegisteredPageRequestHandlerTests.cs
diff --git a/test/ServerHandlers/StaticFileRequestHandlerTests.cs b/Tests/ServerHandlers/StaticFileRequestHandlerTests.cs
similarity index 100%
rename from test/ServerHandlers/StaticFileRequestHandlerTests.cs
rename to Tests/ServerHandlers/StaticFileRequestHandlerTests.cs
diff --git a/test/TestSetup.cs b/Tests/TestSetup.cs
similarity index 95%
rename from test/TestSetup.cs
rename to Tests/TestSetup.cs
index fdaaaa3..6114f15 100644
--- a/test/TestSetup.cs
+++ b/Tests/TestSetup.cs
@@ -36,8 +36,8 @@ public class TestSetup
 
     protected ISite Site;
 
-    // based on the compiled test.dll path
-    // that is typically "bin/Debug/netX.0/test.dll"
+    // based on the compiled Tests.dll path
+    // that is typically "bin/Debug/netX.0/Tests.dll"
     protected const string TestSitesPath = "../../..";
 
     protected TestSetup()
diff --git a/test/test.csproj b/Tests/Tests.csproj
similarity index 93%
rename from test/test.csproj
rename to Tests/Tests.csproj
index c557413..75fa457 100644
--- a/test/test.csproj
+++ b/Tests/Tests.csproj
@@ -6,6 +6,8 @@
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
+
+    <RootNamespace>test</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/source/AssemblyInfo.cs b/source/AssemblyInfo.cs
index 52f99c7..9ead8d2 100644
--- a/source/AssemblyInfo.cs
+++ b/source/AssemblyInfo.cs
@@ -1,3 +1,3 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("test")]
+[assembly: InternalsVisibleTo("Tests")]
-- 
GitLab


From 382a47f2577805f6854411ecac3926030477ca65 Mon Sep 17 00:00:00 2001
From: Bruno Massa <brmassa@gmail.com>
Date: Tue, 7 May 2024 12:40:53 -0500
Subject: [PATCH 6/8] fix: low severity fixes from Qodana/Rider

---
 source/Commands/BaseGeneratorCommand.cs       |  4 ++--
 source/Commands/BuildCommand.cs               |  2 +-
 source/Commands/ServeCommand.cs               |  4 ++--
 source/Helpers/StopwatchReporter.cs           |  2 +-
 source/Models/Page.cs                         |  4 ++--
 source/Models/Site.cs                         | 19 ++++++++-----------
 .../{StaticContext.cs => StaticAotContext.cs} |  0
 source/Program.cs                             |  6 +++---
 .../ServerHandlers/RegisteredPageRequest.cs   |  2 +-
 .../RegisteredPageResourceRequest.cs          |  3 +--
 source/ServerHandlers/StaticFileRequest.cs    |  4 ++--
 source/TemplateEngine/FluidTemplateEngine.cs  |  2 +-
 12 files changed, 24 insertions(+), 28 deletions(-)
 rename source/Parsers/{StaticContext.cs => StaticAotContext.cs} (100%)

diff --git a/source/Commands/BaseGeneratorCommand.cs b/source/Commands/BaseGeneratorCommand.cs
index 7ffc7df..d49e150 100644
--- a/source/Commands/BaseGeneratorCommand.cs
+++ b/source/Commands/BaseGeneratorCommand.cs
@@ -51,9 +51,9 @@ public abstract class BaseGeneratorCommand
     {
         ArgumentNullException.ThrowIfNull(options);
 
-        this.Logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        Logger = logger ?? throw new ArgumentNullException(nameof(logger));
         Stopwatch = new(logger);
-        this.Fs = fs;
+        Fs = fs;
 
         logger.Information("Source path: {source}", propertyValue: options.Source);
 
diff --git a/source/Commands/BuildCommand.cs b/source/Commands/BuildCommand.cs
index 440a063..8c6900f 100644
--- a/source/Commands/BuildCommand.cs
+++ b/source/Commands/BuildCommand.cs
@@ -21,7 +21,7 @@ public class BuildCommand : BaseGeneratorCommand
     public BuildCommand(BuildOptions options, ILogger logger, IFileSystem fs)
         : base(options, logger, fs)
     {
-        this._options = options ?? throw new ArgumentNullException(nameof(options));
+        _options = options ?? throw new ArgumentNullException(nameof(options));
     }
 
     /// <summary>
diff --git a/source/Commands/ServeCommand.cs b/source/Commands/ServeCommand.cs
index c03cbca..f62f451 100644
--- a/source/Commands/ServeCommand.cs
+++ b/source/Commands/ServeCommand.cs
@@ -64,8 +64,8 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable
     public ServeCommand(ServeOptions options, ILogger logger, IFileWatcher fileWatcher, IFileSystem fs)
         : base(options, logger, fs)
     {
-        this._options = options ?? throw new ArgumentNullException(nameof(options));
-        this._fileWatcher = fileWatcher ?? throw new ArgumentNullException(nameof(fileWatcher));
+        _options = options ?? throw new ArgumentNullException(nameof(options));
+        _fileWatcher = fileWatcher ?? throw new ArgumentNullException(nameof(fileWatcher));
 
         // Watch for file changes in the specified path
         var sourceAbsolutePath = Path.GetFullPath(options.Source);
diff --git a/source/Helpers/StopwatchReporter.cs b/source/Helpers/StopwatchReporter.cs
index f1a57fe..033e818 100644
--- a/source/Helpers/StopwatchReporter.cs
+++ b/source/Helpers/StopwatchReporter.cs
@@ -21,7 +21,7 @@ public class StopwatchReporter
     /// </summary>
     public StopwatchReporter(ILogger logger)
     {
-        this._logger = logger;
+        _logger = logger;
         _stopwatches = [];
         _itemCounts = [];
     }
diff --git a/source/Models/Page.cs b/source/Models/Page.cs
index 8c0053d..1ae4d61 100644
--- a/source/Models/Page.cs
+++ b/source/Models/Page.cs
@@ -305,7 +305,7 @@ endif
     /// </summary>
     public Page(in IFrontMatter frontMatter, in ISite site)
     {
-        this._frontMatter = frontMatter;
+        _frontMatter = frontMatter;
         Site = site;
     }
 
@@ -448,7 +448,7 @@ endif
         }
         catch
         {
-            return;
+            // ignored
         }
     }
 
diff --git a/source/Models/Site.cs b/source/Models/Site.cs
index f065b81..ee19533 100644
--- a/source/Models/Site.cs
+++ b/source/Models/Site.cs
@@ -139,7 +139,7 @@ public class Site : ISite
     private const string IndexBranchFileConst = "_index.md";
 
     /// <summary>
-    /// The synchronization lock object during ProstProcess.
+    /// The synchronization lock object during PostProcess.
     /// </summary>
     private readonly object _syncLockPostProcess = new();
 
@@ -167,12 +167,12 @@ public class Site : ISite
         in ILogger logger, ISystemClock? clock)
     {
         Options = options;
-        this._settings = settings;
+        _settings = settings;
         Logger = logger;
         Parser = parser;
         TemplateEngine = new FluidTemplateEngine();
 
-        this._clock = clock ?? new SystemClock();
+        _clock = clock ?? new SystemClock();
 
         Theme = Theme.CreateFromSite(this);
     }
@@ -290,8 +290,7 @@ public class Site : ISite
 
             // Remove the selected file from markdownFiles
             markdownFiles = bundleType == BundleType.Leaf
-                ? Array.Empty<string>()
-                : markdownFiles.Where(file => file != selectedFile).ToArray();
+                ? [] : markdownFiles.Where(file => file != selectedFile).ToArray();
 
             IPage? page = ParseSourceFile(selectedFile!, parent, bundleType);
             if (page is null)
@@ -301,7 +300,7 @@ public class Site : ISite
 
             if (level == 0)
             {
-                _ = OutputReferences.TryRemove(page!.Permalink!, out _);
+                _ = OutputReferences.TryRemove(page.Permalink!, out _);
                 page.Permalink = "/";
                 page.Kind = Kind.Index;
 
@@ -334,8 +333,6 @@ public class Site : ISite
                 SourceContentPath,
                 fileFullPath
             );
-            // var frontMatter = Parser.ParseFrontmatterAndMarkdown(fileFullPath, fileRelativePath, fileContent)
-            //  ?? throw new FormatException($"Error parsing front matter for {fileFullPath}");
             var frontMatter = FrontMatter.Parse(fileFullPath, fileRelativePath, Parser, fileContent)
                 ?? throw new FormatException($"Error parsing front matter for {fileFullPath}");
 
@@ -353,7 +350,7 @@ public class Site : ISite
             Logger.Error(ex, "Error parsing file {file}", fileFullPath);
         }
 
-        // Use interlocked to safely increment the counter in a multi-threaded environment
+        // Use interlocked to safely increment the counter in a multithreaded environment
         _ = Interlocked.Increment(ref _filesParsedToReport);
 
         return page;
@@ -378,9 +375,9 @@ public class Site : ISite
                 page.PostProcess();
 
                 // Replace the old page with the newly created one
-                if (oldOutput is IPage oldpage && oldpage.PagesReferences is not null)
+                if (oldOutput is IPage oldPage)
                 {
-                    foreach (var pageOld in oldpage.PagesReferences)
+                    foreach (var pageOld in oldPage.PagesReferences)
                     {
                         page.PagesReferences.Add(pageOld);
                     }
diff --git a/source/Parsers/StaticContext.cs b/source/Parsers/StaticAotContext.cs
similarity index 100%
rename from source/Parsers/StaticContext.cs
rename to source/Parsers/StaticAotContext.cs
diff --git a/source/Program.cs b/source/Program.cs
index f0f4915..a3fddc8 100644
--- a/source/Program.cs
+++ b/source/Program.cs
@@ -51,7 +51,7 @@ public class Program(ILogger logger)
     {
         OutputLogo();
         OutputWelcome();
-        return await CommandLine.Parser.Default.ParseArguments<BuildOptions, ServeOptions, CheckLinkOptions, NewSiteOptions, NewThemeOptions>(args)
+        return await Parser.Default.ParseArguments<BuildOptions, ServeOptions, CheckLinkOptions, NewSiteOptions, NewThemeOptions>(args)
             .WithParsed<GenerateOptions>(options =>
             {
                 logger = CreateLogger(options.Verbose);
@@ -99,7 +99,7 @@ public class Program(ILogger logger)
                 (CheckLinkOptions options) =>
                 {
                     logger = CreateLogger(options.Verbose);
-                    var command = new Commands.CheckLinkCommand(options, logger);
+                    var command = new CheckLinkCommand(options, logger);
                     return command.Run();
                 },
                 (NewSiteOptions options) =>
@@ -113,7 +113,7 @@ public class Program(ILogger logger)
                     var command = new NewThemeCommand(options, logger);
                     return Task.FromResult(command.Run());
                 },
-                 errs => Task.FromResult(0)
+                 _ => Task.FromResult(0)
                 ).ConfigureAwait(false);
     }
 
diff --git a/source/ServerHandlers/RegisteredPageRequest.cs b/source/ServerHandlers/RegisteredPageRequest.cs
index dc0e10e..460cc82 100644
--- a/source/ServerHandlers/RegisteredPageRequest.cs
+++ b/source/ServerHandlers/RegisteredPageRequest.cs
@@ -16,7 +16,7 @@ public class RegisteredPageRequest : IServerHandlers
     /// <param name="site"></param>
     public RegisteredPageRequest(ISite site)
     {
-        this._site = site;
+        _site = site;
     }
 
     /// <inheritdoc />
diff --git a/source/ServerHandlers/RegisteredPageResourceRequest.cs b/source/ServerHandlers/RegisteredPageResourceRequest.cs
index e5f7fe0..ec94517 100644
--- a/source/ServerHandlers/RegisteredPageResourceRequest.cs
+++ b/source/ServerHandlers/RegisteredPageResourceRequest.cs
@@ -1,5 +1,4 @@
 using SuCoS.Models;
-using System.Reflection;
 
 namespace SuCoS.ServerHandlers;
 
@@ -16,7 +15,7 @@ public class RegisteredPageResourceRequest : IServerHandlers
     /// <param name="site"></param>
     public RegisteredPageResourceRequest(ISite site)
     {
-        this._site = site;
+        _site = site;
     }
 
     /// <inheritdoc />
diff --git a/source/ServerHandlers/StaticFileRequest.cs b/source/ServerHandlers/StaticFileRequest.cs
index 96b110d..6731f6b 100644
--- a/source/ServerHandlers/StaticFileRequest.cs
+++ b/source/ServerHandlers/StaticFileRequest.cs
@@ -17,8 +17,8 @@ public class StaticFileRequest : IServerHandlers
     /// <param name="inTheme"></param>
     public StaticFileRequest(string? basePath, bool inTheme)
     {
-        this._basePath = basePath;
-        this._inTheme = inTheme;
+        _basePath = basePath;
+        _inTheme = inTheme;
     }
 
     /// <inheritdoc />
diff --git a/source/TemplateEngine/FluidTemplateEngine.cs b/source/TemplateEngine/FluidTemplateEngine.cs
index ce3cfe4..bd65ba8 100644
--- a/source/TemplateEngine/FluidTemplateEngine.cs
+++ b/source/TemplateEngine/FluidTemplateEngine.cs
@@ -64,7 +64,7 @@ public class FluidTemplateEngine : ITemplateEngine
     /// <inheritdoc/>
     public string? ParseResource(string? data, ISite site, IPage page, int counter)
     {
-        if (string.IsNullOrEmpty(data) || !FluidParser.TryParse(data, out var templateFileName, out var _))
+        if (string.IsNullOrEmpty(data) || !FluidParser.TryParse(data, out var templateFileName, out _))
         {
             return null;
         }
-- 
GitLab


From 9afbcad39c1b57f5af904e72ccf721e7275b573a Mon Sep 17 00:00:00 2001
From: Bruno Massa <brmassa@gmail.com>
Date: Tue, 7 May 2024 13:22:34 -0500
Subject: [PATCH 7/8] fix: minor typos

---
 .editorconfig                                 | 94 +++++++++++++++----
 .gitignore                                    |  1 +
 Tests/Commands/BaseGeneratorCommandTests.cs   |  8 +-
 Tests/Commands/BuildCommandTests.cs           |  3 +-
 Tests/Commands/NewSiteCommandTests.cs         | 28 ++----
 Tests/Helpers/StopwatchReporterTests.cs       |  5 +-
 Tests/Models/PageTests.cs                     |  6 +-
 Tests/Parser/YAMLParserTests.cs               | 37 ++++----
 .../RegisteredPageRequestHandlerTests.cs      | 10 +-
 source/Commands/BuildCommand.cs               |  4 +-
 source/Commands/CheckLinkCommand.cs           | 12 +--
 source/Commands/NewSiteCommand.cs             |  4 +-
 source/Commands/NewThemeCommand.cs            |  4 +-
 source/Helpers/SiteHelper.cs                  |  4 +-
 source/Models/Bundle.cs                       |  4 +-
 .../CommandLineOptions/CheckLinkOptions.cs    |  4 +-
 source/Models/FrontMatter.cs                  |  2 +-
 source/Models/IFrontMatter.cs                 |  2 +-
 source/Models/IPage.cs                        |  4 +-
 source/Models/ISite.cs                        |  4 +-
 source/Models/Page.cs                         | 22 ++---
 source/Parsers/IMetadataParser.cs             |  4 +-
 source/Program.cs                             |  2 +-
 .../ServerHandlers/RegisteredPageRequest.cs   |  2 +-
 source/ServerHandlers/StaticFileRequest.cs    |  2 +-
 25 files changed, 152 insertions(+), 120 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index e77d93c..4382be9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,5 @@
-# Editor configuration, see https://editorconfig.org
 root = true
+# Editor configuration, see https://editorconfig.org
 
 [*]
 charset = utf-8
@@ -10,6 +10,57 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 max_line_length = 80
 
+# Microsoft .NET properties
+csharp_new_line_before_members_in_object_initializers = false
+csharp_preferred_modifier_order = public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion
+csharp_style_expression_bodied_accessors = true:error
+csharp_style_expression_bodied_properties = true:error
+csharp_style_namespace_declarations = file_scoped:warning
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_var_elsewhere = true:error
+csharp_style_var_for_built_in_types = true:error
+csharp_style_var_when_type_is_apparent = true:error
+dotnet_naming_rule.unity_serialized_field_rule.import_to_resharper = True
+dotnet_naming_rule.unity_serialized_field_rule.resharper_description = Unity serialized field
+dotnet_naming_rule.unity_serialized_field_rule.resharper_guid = 5f0fdb63-c892-4d2c-9324-15c80b22a7ef
+dotnet_naming_rule.unity_serialized_field_rule.severity = warning
+dotnet_naming_rule.unity_serialized_field_rule.style = lower_camel_case_style
+dotnet_naming_rule.unity_serialized_field_rule.symbols = unity_serialized_field_symbols
+dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
+dotnet_naming_symbols.unity_serialized_field_symbols.applicable_accessibilities = *
+dotnet_naming_symbols.unity_serialized_field_symbols.applicable_kinds = 
+dotnet_naming_symbols.unity_serialized_field_symbols.resharper_applicable_kinds = unity_serialised_field
+dotnet_naming_symbols.unity_serialized_field_symbols.resharper_required_modifiers = instance
+dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none
+dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+
+# ReSharper properties
+resharper_apply_auto_detected_rules = false
+resharper_enforce_line_ending_style = true
+resharper_use_indent_from_vs = false
+resharper_wrap_lines = true
+
+# ReSharper inspection severities
+resharper_arrange_redundant_parentheses_highlighting = hint
+resharper_arrange_this_qualifier_highlighting = hint
+resharper_arrange_type_member_modifiers_highlighting = hint
+resharper_arrange_type_modifiers_highlighting = hint
+resharper_built_in_type_reference_style_for_member_access_highlighting = hint
+resharper_built_in_type_reference_style_highlighting = hint
+resharper_razor_assembly_not_resolved_highlighting = warning
+resharper_redundant_base_qualifier_highlighting = warning
+resharper_web_config_module_not_resolved_highlighting = warning
+resharper_web_config_type_not_resolved_highlighting = warning
+resharper_web_config_wrong_module_highlighting = warning
+
 [*.cs]
 csharp_indent_block_contents = true
 csharp_indent_case_contents = true
@@ -19,8 +70,8 @@ csharp_indent_switch_sections = true
 
 csharp_style_namespace_declarations = file_scoped:warning
 
-dotnet_diagnostic.IDE0090.severity = warning # Use 'new(...)' instead of 'new ...'
-dotnet_diagnostic.IDE1006.severity = warning
+dotnet_diagnostic.ide0090.severity = warning # Use 'new(...)' instead of 'new ...'
+dotnet_diagnostic.ide1006.severity = warning
 
 dotnet_naming_symbols.instance_fields.applicable_kinds = field
 dotnet_naming_symbols.instance_fields.applicable_accessibilities = private
@@ -49,23 +100,28 @@ csharp_space_after_keywords_in_control_flow_statements = true
 trim_trailing_whitespace = true
 
 # Code quality
-dotnet_diagnostic.CA1062.severity = warning
-dotnet_diagnostic.CA1303.severity = error
-dotnet_diagnostic.CA1304.severity = error
-dotnet_diagnostic.CA1305.severity = warning
-dotnet_diagnostic.CA1307.severity = error
-dotnet_diagnostic.CA1308.severity = error
-dotnet_diagnostic.CA1309.severity = error
-dotnet_diagnostic.CA1820.severity = error
-dotnet_diagnostic.CA2000.severity = error
-dotnet_diagnostic.CA2100.severity = error
-dotnet_diagnostic.CA2201.severity = error
-dotnet_diagnostic.CA2208.severity = error
-dotnet_diagnostic.CA2214.severity = error
-dotnet_diagnostic.CS8019.severity = warning
-dotnet_diagnostic.IDE0055.severity = warning
+dotnet_diagnostic.ca1062.severity = warning
+dotnet_diagnostic.ca1303.severity = error
+dotnet_diagnostic.ca1304.severity = error
+dotnet_diagnostic.ca1305.severity = warning
+dotnet_diagnostic.ca1307.severity = error
+dotnet_diagnostic.ca1308.severity = error
+dotnet_diagnostic.ca1309.severity = error
+dotnet_diagnostic.ca1820.severity = error
+dotnet_diagnostic.ca2000.severity = error
+dotnet_diagnostic.ca2100.severity = error
+dotnet_diagnostic.ca2201.severity = error
+dotnet_diagnostic.ca2208.severity = error
+dotnet_diagnostic.ca2214.severity = error
+dotnet_diagnostic.cs8019.severity = warning
+dotnet_diagnostic.ide0055.severity = warning
 
 [**/obj/**/*.cs]
-dotnet_diagnostic.CS8019.severity = none # disable on debug genereated files
+dotnet_diagnostic.cs8019.severity = none # disable on debug genereated files
 exclude = true
 generated_code = true
+
+[*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,c++m,cc,ccm,cginc,compute,cp,cpp,cppm,cs,cshtml,cu,cuh,cxx,cxxm,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,ixx,master,ml,mli,mpp,mq4,mq5,mqh,mxx,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,uxml,vb,xaml,xamlx,xoml,xsd}]
+indent_style = space
+indent_size = 4
+tab_width = 4
diff --git a/.gitignore b/.gitignore
index ec824ea..3e7978c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ project.lock.json
 **/coverage-results/
 .idea/
 qodana.yaml
+qodana.sarif.json
diff --git a/Tests/Commands/BaseGeneratorCommandTests.cs b/Tests/Commands/BaseGeneratorCommandTests.cs
index a721499..7e1a22f 100644
--- a/Tests/Commands/BaseGeneratorCommandTests.cs
+++ b/Tests/Commands/BaseGeneratorCommandTests.cs
@@ -1,6 +1,5 @@
 using NSubstitute;
 using Serilog;
-using SuCoS;
 using SuCoS.Models.CommandLineOptions;
 using SuCoS.TemplateEngine;
 using System.Reflection;
@@ -22,12 +21,7 @@ public class BaseGeneratorCommandTests
     private class BaseGeneratorCommandStub(IGenerateOptions options, ILogger logger, IFileSystem fs)
         : BaseGeneratorCommand(options, logger, fs);
 
-    private readonly IFileSystem _fs;
-
-    public BaseGeneratorCommandTests()
-    {
-        _fs = Substitute.For<IFileSystem>();
-    }
+    private readonly IFileSystem _fs = Substitute.For<IFileSystem>();
 
     [Fact]
     public void Constructor_ShouldThrowArgumentNullException_WhenOptionsIsNull()
diff --git a/Tests/Commands/BuildCommandTests.cs b/Tests/Commands/BuildCommandTests.cs
index 3b16b3d..1099113 100644
--- a/Tests/Commands/BuildCommandTests.cs
+++ b/Tests/Commands/BuildCommandTests.cs
@@ -2,7 +2,6 @@ using SuCoS.Models.CommandLineOptions;
 using Xunit;
 using NSubstitute;
 using Serilog;
-using SuCoS;
 using SuCoS.Commands;
 using SuCoS.Helpers;
 
@@ -20,7 +19,7 @@ public class BuildCommandTests
         _fileSystem = Substitute.For<IFileSystem>();
         _fileSystem.FileExists("./sucos.yaml").Returns(true);
         _fileSystem.FileReadAllText("./sucos.yaml").Returns("""
-Ttile: test
+Title: test
 """);
         _options = new BuildOptions { Output = "test" };
     }
diff --git a/Tests/Commands/NewSiteCommandTests.cs b/Tests/Commands/NewSiteCommandTests.cs
index dcd986b..b148000 100644
--- a/Tests/Commands/NewSiteCommandTests.cs
+++ b/Tests/Commands/NewSiteCommandTests.cs
@@ -1,4 +1,3 @@
-using SuCoS;
 using SuCoS.Models;
 using SuCoS.Models.CommandLineOptions;
 using Xunit;
@@ -11,22 +10,15 @@ namespace Tests.Commands;
 
 public class NewSiteCommandTests
 {
-    private readonly ILogger _logger;
-    private readonly IFileSystem _fileSystem;
-    private readonly ISite _site;
-
-    public NewSiteCommandTests()
-    {
-        _logger = Substitute.For<ILogger>();
-        _fileSystem = Substitute.For<IFileSystem>();
-        _site = Substitute.For<ISite>();
-    }
+    private readonly ILogger _logger = Substitute.For<ILogger>();
+    private readonly IFileSystem _fileSystem = Substitute.For<IFileSystem>();
+    private readonly ISite _site = Substitute.For<ISite>();
 
     [Fact]
     public void Create_ShouldReturnNewSiteCommand_WhenParametersAreValid()
     {
         // Arrange
-        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "http://test.com" };
+        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "https://test.com" };
 
         // Act
         var result = NewSiteCommand.Create(options, _logger, _fileSystem);
@@ -46,7 +38,7 @@ public class NewSiteCommandTests
     public void Create_ShouldNotReturnNull_WhenParametersAreValid()
     {
         // Arrange
-        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "http://test.com" };
+        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "https://test.com" };
 
         // Act
         var result = NewSiteCommand.Create(options, _logger, _fileSystem);
@@ -59,7 +51,7 @@ public class NewSiteCommandTests
     public void Run_ShouldLogInformation_WhenCreatingNewSite()
     {
         // Arrange
-        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "http://test.com", Force = false };
+        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "https://test.com", Force = false };
         _fileSystem.FileExists(Arg.Any<string>()).Returns(false);
 
         var newSiteCommand = NewSiteCommand.Create(options, _logger, _fileSystem);
@@ -75,7 +67,7 @@ public class NewSiteCommandTests
     public void Run_ShouldCallCreateDirectoryWithCorrectPaths_ForEachFolder()
     {
         // Arrange
-        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "http://test.com", Force = false };
+        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "https://test.com", Force = false };
         _site.SourceFolders.Returns(["folder1", "folder2"]);
         _fileSystem.FileExists(Arg.Any<string>()).Returns(false);
 
@@ -93,11 +85,11 @@ public class NewSiteCommandTests
     public void Run_ShouldReturn1_WhenCreateDirectoryThrowsException()
     {
         // Arrange
-        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "http://test.com", Force = false };
+        var options = new NewSiteOptions { Output = "test", Title = "Test", Description = "Test", BaseUrl = "https://test.com", Force = false };
         _site.SourceFolders.Returns(["folder1", "folder2"]);
         _fileSystem.FileExists(Arg.Any<string>()).Returns(false);
         _fileSystem.When(x => x.DirectoryCreateDirectory(Arg.Any<string>()))
-            .Do(x => { throw new ArgumentNullException(); });
+            .Do(_ => throw new ArgumentNullException());
 
         var newSiteCommand = new NewSiteCommand(options, _logger, _fileSystem, _site);
 
@@ -164,7 +156,7 @@ public class NewSiteCommandTests
         _fileSystem.FileExists(Arg.Any<string>()).Returns(false);
         _site.Parser
             .When(x => x.Export(Arg.Any<SiteSettings>(), Arg.Any<string>()))
-            .Do(x => { throw new ArgumentNullException(); });
+            .Do(_ => throw new ArgumentNullException());
 
         var newSiteCommand = new NewSiteCommand(options, _logger, _fileSystem, _site);
 
diff --git a/Tests/Helpers/StopwatchReporterTests.cs b/Tests/Helpers/StopwatchReporterTests.cs
index c5701b5..e6154e8 100644
--- a/Tests/Helpers/StopwatchReporterTests.cs
+++ b/Tests/Helpers/StopwatchReporterTests.cs
@@ -57,8 +57,9 @@ public class StopwatchReporterTests
 
         // Assert
         var logEvents = _inMemorySink.LogEvents;
-        Assert.NotEmpty(logEvents);
-        var logMessage = logEvents.First().RenderMessage(CultureInfo.InvariantCulture);
+        var logEventsList = logEvents.ToList();
+        Assert.NotEmpty(logEventsList);
+        var logMessage = logEventsList.First().RenderMessage(CultureInfo.InvariantCulture);
         Assert.Contains($"Site '{siteTitle}' created!", logMessage, StringComparison.InvariantCulture);
         Assert.Contains(stepName, logMessage, StringComparison.InvariantCulture);
         // Assert.Contains($"{duration} ms", logMessage, StringComparison.InvariantCulture); // Ensure that our processing time was logged.
diff --git a/Tests/Models/PageTests.cs b/Tests/Models/PageTests.cs
index b352c13..706819f 100644
--- a/Tests/Models/PageTests.cs
+++ b/Tests/Models/PageTests.cs
@@ -21,7 +21,7 @@ console.WriteLine('hello word')
     private const string Markdown2Const = @"
 # word01 word02
 
-word03 word04 word05 6 7 [eight](http://example.com)";
+word03 word04 word05 6 7 [eight](https://example.com)";
     private const string MarkdownPlain1Const = @"word01 word02
 word03 word04 word05 6 7 eight
 nine
@@ -33,7 +33,7 @@ word03 word04 word05 6 7 eight
 
     [Theory]
     [InlineData("Test Title", "/path/to/file.md", "file", "/path/to")]
-    public void Frontmatter_ShouldCreateWithCorrectProperties(string title, string sourcePath, string sourceFileNameWithoutExtension, string sourcePathDirectory)
+    public void FrontMatter_ShouldCreateWithCorrectProperties(string title, string sourcePath, string sourceFileNameWithoutExtension, string sourcePathDirectory)
     {
         var page = new Page(FrontMatterMock, Site);
 
@@ -46,7 +46,7 @@ word03 word04 word05 6 7 eight
     }
 
     [Fact]
-    public void Frontmatter_ShouldHaveDefaultValuesForOptionalProperties()
+    public void FrontMatter_ShouldHaveDefaultValuesForOptionalProperties()
     {
         // Arrange
         var page = new Page(FrontMatterMock, Site);
diff --git a/Tests/Parser/YAMLParserTests.cs b/Tests/Parser/YAMLParserTests.cs
index 871f1c2..d073a83 100644
--- a/Tests/Parser/YAMLParserTests.cs
+++ b/Tests/Parser/YAMLParserTests.cs
@@ -8,9 +8,9 @@ namespace Tests.YAMLParser;
 
 public class YamlParserTests : TestSetup
 {
-    private readonly YamlParser _parser;
+    private readonly YamlParser _parser = new();
 
-    private const string PageFrontmaterConst = @"Title: Test Title
+    private const string PageFrontMatterConst = @"Title: Test Title
 Type: post
 Date: 2023-07-01
 LastMod: 2023-06-01
@@ -58,16 +58,11 @@ Params:
 ";
     private const string FileFullPathConst = "test.md";
     private const string FileRelativePathConst = "test.md";
-    private readonly string _pageContent;
-
-    public YamlParserTests()
-    {
-        _parser = new YamlParser();
-        _pageContent = @$"---
-{PageFrontmaterConst}
+    private readonly string _pageContent = @$"---
+{PageFrontMatterConst}
 ---
 {PageMarkdownConst}";
-    }
+    private static readonly string[] Expected = new[] { "Test", "Real Data" };
 
     [Fact]
     public void GetSection_ShouldReturnFirstFolderName()
@@ -91,7 +86,7 @@ Title: Test Title
 Date: 2023-04-01
 ---
 ", "")]
-    public void ParseFrontmatter_ShouldParseTitleCorrectly(string fileContent, string expectedTitle)
+    public void ParseFrontMatter_ShouldParseTitleCorrectly(string fileContent, string expectedTitle)
     {
         // Arrange
         var frontMatter = FrontMatter.Parse(FileRelativePathConst, FileFullPathConst, _parser, fileContent);
@@ -109,7 +104,7 @@ Date: 2023-01-01
 Date: 2023/01/01
 ---
 ", "2023-01-01")]
-    public void ParseFrontmatter_ShouldParseDateCorrectly(string fileContent, string expectedDateString)
+    public void ParseFrontMatter_ShouldParseDateCorrectly(string fileContent, string expectedDateString)
     {
         // Arrange
         var expectedDate = DateTime.Parse(expectedDateString, CultureInfo.InvariantCulture);
@@ -122,7 +117,7 @@ Date: 2023/01/01
     }
 
     [Fact]
-    public void ParseFrontmatter_ShouldParseOtherFieldsCorrectly()
+    public void ParseFrontMatter_ShouldParseOtherFieldsCorrectly()
     {
         // Arrange
         var expectedDate = DateTime.Parse("2023-07-01", CultureInfo.InvariantCulture);
@@ -143,7 +138,7 @@ Date: 2023/01/01
     }
 
     [Fact]
-    public void ParseFrontmatter_ShouldThrowFormatException_WhenInvalidYAMLSyntax()
+    public void ParseFrontMatter_ShouldThrowFormatException_WhenInvalidYAMLSyntax()
     {
         // Arrange
         const string fileContent = @"---
@@ -183,7 +178,7 @@ Title
     }
 
     [Fact]
-    public void ParseFrontmatter_ShouldParseContentInSiteFolder()
+    public void ParseFrontMatter_ShouldParseContentInSiteFolder()
     {
         // Arrange
         var date = DateTime.Parse("2023-07-01", CultureInfo.InvariantCulture);
@@ -198,7 +193,7 @@ Title
     }
 
     [Fact]
-    public void ParseFrontmatter_ShouldCreateTags()
+    public void ParseFrontMatter_ShouldCreateTags()
     {
         // Arrange
         var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, _parser, _pageContent);
@@ -214,13 +209,13 @@ Title
     [Fact]
     public void FrontMatterParse_RawContentNull()
     {
-        _ = Assert.Throws<FormatException>(() => FrontMatter.Parse("invalidFrontmatter", "", "fakePath", "fakePath", FrontMatterParser));
+        _ = Assert.Throws<FormatException>(() => FrontMatter.Parse("invalidFrontMatter", "", "fakePath", "fakePath", FrontMatterParser));
     }
 
     [Fact]
-    public void ParseYAML_ShouldThrowExceptionWhenFrontmatterIsInvalid()
+    public void ParseYAML_ShouldThrowExceptionWhenFrontMatterIsInvalid()
     {
-        _ = Assert.Throws<FormatException>(() => _parser.Parse<FrontMatter>("invalidFrontmatter"));
+        _ = Assert.Throws<FormatException>(() => _parser.Parse<FrontMatter>("invalidFrontMatter"));
     }
 
     [Fact]
@@ -230,7 +225,7 @@ Title
         var (metadata, rawContent) = _parser.SplitFrontMatter(_pageContent);
 
         // Assert
-        Assert.Equal(PageFrontmaterConst.TrimEnd(), metadata);
+        Assert.Equal(PageFrontMatterConst.TrimEnd(), metadata);
         Assert.Equal(PageMarkdownConst, rawContent);
     }
 
@@ -265,7 +260,7 @@ Title
         Assert.DoesNotContain("customParam", Site.Params);
         Assert.Contains("ParamsCustomParam", Site.Params);
         Assert.Equal("Custom Value", Site.Params["ParamsCustomParam"]);
-        Assert.Equal(new[] { "Test", "Real Data" }, ((Dictionary<string, object>)siteSettings.Params["ParamsNestedData"])["Level2"]);
+        Assert.Equal(Expected, ((Dictionary<string, object>)siteSettings.Params["ParamsNestedData"])["Level2"]);
         Assert.Equal("Test", ((siteSettings.Params["ParamsNestedData"] as Dictionary<string, object>)?["Level2"] as List<object>)?[0]);
     }
 }
diff --git a/Tests/ServerHandlers/RegisteredPageRequestHandlerTests.cs b/Tests/ServerHandlers/RegisteredPageRequestHandlerTests.cs
index 24c3118..ea788ec 100644
--- a/Tests/ServerHandlers/RegisteredPageRequestHandlerTests.cs
+++ b/Tests/ServerHandlers/RegisteredPageRequestHandlerTests.cs
@@ -1,5 +1,4 @@
 using NSubstitute;
-using SuCoS;
 using SuCoS.Helpers;
 using SuCoS.Models;
 using SuCoS.Models.CommandLineOptions;
@@ -11,12 +10,7 @@ namespace Tests.ServerHandlers;
 
 public class RegisteredPageRequestHandlerTests : TestSetup
 {
-    private readonly IFileSystem _fs;
-
-    public RegisteredPageRequestHandlerTests()
-    {
-        _fs = new FileSystem();
-    }
+    private readonly IFileSystem _fs = new FileSystem();
 
     [Theory]
     [InlineData("/", true)]
@@ -80,7 +74,7 @@ public class RegisteredPageRequestHandlerTests : TestSetup
         }
         else
         {
-            Assert.DoesNotContain("</cript>", content, StringComparison.InvariantCulture);
+            Assert.DoesNotContain("</script>", content, StringComparison.InvariantCulture);
             Assert.DoesNotContain("</script>", content, StringComparison.InvariantCulture);
         }
         Assert.Contains("Index Content", content, StringComparison.InvariantCulture);
diff --git a/source/Commands/BuildCommand.cs b/source/Commands/BuildCommand.cs
index 8c6900f..1ad4bb1 100644
--- a/source/Commands/BuildCommand.cs
+++ b/source/Commands/BuildCommand.cs
@@ -25,7 +25,7 @@ public class BuildCommand : BaseGeneratorCommand
     }
 
     /// <summary>
-    /// Run the commmand
+    /// Run the command
     /// </summary>
     public int Run()
     {
@@ -76,7 +76,7 @@ public class BuildCommand : BaseGeneratorCommand
                 // Log
                 Logger.Debug("Page created: {Permalink}", outputAbsolutePath);
 
-                // Use interlocked to safely increment the counter in a multi-threaded environment
+                // Use interlocked to safely increment the counter in a multithreaded environment
                 _ = Interlocked.Increment(ref pagesCreated);
             }
             else if (output is IResource resource)
diff --git a/source/Commands/CheckLinkCommand.cs b/source/Commands/CheckLinkCommand.cs
index 0f7428e..2c18900 100644
--- a/source/Commands/CheckLinkCommand.cs
+++ b/source/Commands/CheckLinkCommand.cs
@@ -45,12 +45,12 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
         {
             logger.Error("There are failed checks.");
 
-            foreach (var (link, linkfiles) in _linkToFilesMap)
+            foreach (var (link, linkFiles) in _linkToFilesMap)
             {
                 if (_failedLinks.Contains(link))
                 {
-                    linkfiles.Sort();
-                    logger.Error("Link {link} failed and are in these files:\n{files}", link, string.Join("\n", linkfiles));
+                    linkFiles.Sort();
+                    logger.Error("Link {link} failed and are in these files:\n{files}", link, string.Join("\n", linkFiles));
                 }
             }
             return 1;
@@ -144,15 +144,15 @@ public sealed partial class CheckLinkCommand(CheckLinkOptions settings, ILogger
         return result;
     }
 
-    private bool TryLocalFile(CheckLinkOptions settings, string directoryPath, string fileNameSanitized, string link)
+    private bool TryLocalFile(CheckLinkOptions options, string directoryPath, string fileNameSanitized, string link)
     {
-        if (string.IsNullOrEmpty(settings.InternalUrl) || !link.StartsWith(settings.InternalUrl))
+        if (string.IsNullOrEmpty(options.InternalUrl) || !link.StartsWith(options.InternalUrl))
         {
             return false;
         }
 
         // Strip the InternalURL from the link
-        link = link[settings.InternalUrl.Length..];
+        link = link[options.InternalUrl.Length..];
 
         // Handle the link as a local file
         var localFilePath = Path.Combine(directoryPath, link);
diff --git a/source/Commands/NewSiteCommand.cs b/source/Commands/NewSiteCommand.cs
index d19e68b..0d7dd1e 100644
--- a/source/Commands/NewSiteCommand.cs
+++ b/source/Commands/NewSiteCommand.cs
@@ -9,7 +9,7 @@ namespace SuCoS.Commands;
 /// <summary>
 /// Check links of a given site.
 /// </summary>
-public sealed partial class NewSiteCommand(NewSiteOptions options, ILogger logger, IFileSystem fileSystem, ISite site)
+public sealed class NewSiteCommand(NewSiteOptions options, ILogger logger, IFileSystem fileSystem, ISite site)
 {
     private static SiteSettings _siteSettings = null!;
 
@@ -79,4 +79,4 @@ public sealed partial class NewSiteCommand(NewSiteOptions options, ILogger logge
             fileSystem.DirectoryCreateDirectory(folder);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/source/Commands/NewThemeCommand.cs b/source/Commands/NewThemeCommand.cs
index 03965ad..ddb61f5 100644
--- a/source/Commands/NewThemeCommand.cs
+++ b/source/Commands/NewThemeCommand.cs
@@ -8,7 +8,7 @@ namespace SuCoS.Commands;
 /// <summary>
 /// Check links of a given site.
 /// </summary>
-public sealed partial class NewThemeCommand(NewThemeOptions options, ILogger logger)
+public sealed class NewThemeCommand(NewThemeOptions options, ILogger logger)
 {
     /// <summary>
     /// Run the app
@@ -62,4 +62,4 @@ public sealed partial class NewThemeCommand(NewThemeOptions options, ILogger log
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/source/Helpers/SiteHelper.cs b/source/Helpers/SiteHelper.cs
index 6120604..6c69822 100644
--- a/source/Helpers/SiteHelper.cs
+++ b/source/Helpers/SiteHelper.cs
@@ -20,7 +20,7 @@ public static class SiteHelper
             .Build();
 
     /// <summary>
-    /// Creates the pages dictionary.
+    /// Creates the pages' dictionary.
     /// </summary>
     /// <exception cref="FormatException"></exception>
     public static Site Init(string configFile, IGenerateOptions options, IMetadataParser parser, ILogger logger, StopwatchReporter stopwatch, IFileSystem fs)
@@ -89,7 +89,7 @@ public static class SiteHelper
         ArgumentNullException.ThrowIfNull(parser);
         ArgumentNullException.ThrowIfNull(fs);
 
-        // Read the main configation
+        // Read the main configuration
         var filePath = Path.Combine(options.Source, configFile);
         if (!fs.FileExists(filePath))
         {
diff --git a/source/Models/Bundle.cs b/source/Models/Bundle.cs
index aa4be65..8517754 100644
--- a/source/Models/Bundle.cs
+++ b/source/Models/Bundle.cs
@@ -11,12 +11,12 @@ public enum BundleType
     None,
 
     /// <summary>
-    /// Bundle with no childre
+    /// Bundle with no children
     /// </summary>
     Leaf,
 
     /// <summary>
-    /// Bundle with children embeded, like a home page, taxonomy term, taxonomy list
+    /// Bundle with children embedded, like a home page, taxonomy term, taxonomy list
     /// </summary>
     Branch
 }
diff --git a/source/Models/CommandLineOptions/CheckLinkOptions.cs b/source/Models/CommandLineOptions/CheckLinkOptions.cs
index f133bf7..10307dd 100644
--- a/source/Models/CommandLineOptions/CheckLinkOptions.cs
+++ b/source/Models/CommandLineOptions/CheckLinkOptions.cs
@@ -3,9 +3,9 @@ using CommandLine;
 namespace SuCoS.Models.CommandLineOptions;
 
 /// <summary>
-/// Command line options for the checklinks command.
+/// Command line options for the check-links command.
 /// </summary>
-[Verb("checklinks", HelpText = "Checks links of a given site")]
+[Verb("check-links", HelpText = "Checks links of a given site")]
 public class CheckLinkOptions
 {
     /// <summary>
diff --git a/source/Models/FrontMatter.cs b/source/Models/FrontMatter.cs
index f1bf337..942b958 100644
--- a/source/Models/FrontMatter.cs
+++ b/source/Models/FrontMatter.cs
@@ -5,7 +5,7 @@ using YamlDotNet.Serialization;
 namespace SuCoS.Models;
 
 /// <summary>
-/// A scafold structure to help creating system-generated content, like
+/// A scaffold structure to help creating system-generated content, like
 /// tag, section or index pages
 /// </summary>
 [YamlSerializable]
diff --git a/source/Models/IFrontMatter.cs b/source/Models/IFrontMatter.cs
index b7761b8..3618a4e 100644
--- a/source/Models/IFrontMatter.cs
+++ b/source/Models/IFrontMatter.cs
@@ -111,7 +111,7 @@ public interface IFrontMatter : IParams, IFile
     Kind Kind { get; }
 
     /// <summary>
-    /// The date to be considered as the publish date.
+    /// The date to be considered as the publishing date.
     /// </summary>
     DateTime? GetPublishDate => PublishDate ?? Date;
 }
diff --git a/source/Models/IPage.cs b/source/Models/IPage.cs
index 0937c7f..efe55cc 100644
--- a/source/Models/IPage.cs
+++ b/source/Models/IPage.cs
@@ -119,9 +119,9 @@ public interface IPage : IFrontMatter, IOutput
     /// <summary>
     /// Gets the Permalink path for the file.
     /// </summary>
-    /// <param name="urLforce">The URL to consider. If null use the predefined URL</param>
+    /// <param name="urlForce">The URL to consider. If null use the predefined URL</param>
     /// <returns>The output path.</returns>
-    public string CreatePermalink(string? urLforce = null);
+    public string CreatePermalink(string? urlForce = null);
 
     /// <summary>
     /// Final steps of parsing the content.
diff --git a/source/Models/ISite.cs b/source/Models/ISite.cs
index 4abc463..f2084ec 100644
--- a/source/Models/ISite.cs
+++ b/source/Models/ISite.cs
@@ -10,7 +10,7 @@ namespace SuCoS.Models;
 /// <summary>
 /// The main configuration of the program, primarily extracted from the app.yaml file.
 /// </summary>
-public interface ISite : ISiteSettings, IParams
+public interface ISite : ISiteSettings
 {
     /// <summary>
     /// Command line options
@@ -84,7 +84,7 @@ public interface ISite : ISiteSettings, IParams
 
     /// <summary>
     /// Search recursively for all markdown files in the content folder, then
-    /// parse their content for front matter meta data and markdown.
+    /// parse their content for front matter metadata and markdown.
     /// </summary>
     /// <param name="fs"></param>
     /// <param name="directory">Folder to scan</param>
diff --git a/source/Models/Page.cs b/source/Models/Page.cs
index 1ae4d61..a11c1c4 100644
--- a/source/Models/Page.cs
+++ b/source/Models/Page.cs
@@ -312,33 +312,33 @@ endif
     /// <summary>
     /// Gets the Permalink path for the file.
     /// </summary>
-    /// <param name="urLforce">The URL to consider. If null use the predefined URL</param>
+    /// <param name="urlForce">The URL to consider. If null use the predefined URL</param>
     /// <returns>The output path.</returns>
     /// <see cref="UrlForIndex"/>
     /// <see cref="UrlForNonIndex"/>
-    public string CreatePermalink(string? urLforce = null)
+    public string CreatePermalink(string? urlForce = null)
     {
         var isIndex = SourceFileNameWithoutExtension == "index";
 
-        var permaLink = string.Empty;
+        var permalink = string.Empty;
 
-        urLforce ??= URL ?? (isIndex ? UrlForIndex : UrlForNonIndex);
+        urlForce ??= URL ?? (isIndex ? UrlForIndex : UrlForNonIndex);
 
         try
         {
-            permaLink = Site.TemplateEngine.Parse(urLforce, Site, this);
+            permalink = Site.TemplateEngine.Parse(urlForce, Site, this);
         }
         catch (Exception ex)
         {
-            Site.Logger.Error(ex, "Error converting URL: {URLforce}", urLforce);
+            Site.Logger.Error(ex, "Error converting URL: {UrlForce}", urlForce);
         }
 
-        if (!Path.IsPathRooted(permaLink) && !permaLink.StartsWith('/'))
+        if (!Path.IsPathRooted(permalink) && !permalink.StartsWith('/'))
         {
-            permaLink = $"/{permaLink}";
+            permalink = $"/{permalink}";
         }
 
-        return Urlizer.UrlizePath(permaLink);
+        return Urlizer.UrlizePath(permalink);
     }
 
     /// <inheritdoc/>
@@ -409,7 +409,7 @@ endif
                 Resources ??= [];
                 var filenameOriginal = Path.GetFileName(resourceFilename);
                 var filename = filenameOriginal;
-                var extention = Path.GetExtension(resourceFilename);
+                var extension = Path.GetExtension(resourceFilename);
                 var title = filename;
                 Dictionary<string, object> resourceParams = [];
 
@@ -434,7 +434,7 @@ endif
                     }
                 }
 
-                filename = Path.GetFileNameWithoutExtension(filename) + extention;
+                filename = Path.GetFileNameWithoutExtension(filename) + extension;
                 var resource = new Resource()
                 {
                     Title = title,
diff --git a/source/Parsers/IMetadataParser.cs b/source/Parsers/IMetadataParser.cs
index d9c2031..c83de15 100644
--- a/source/Parsers/IMetadataParser.cs
+++ b/source/Parsers/IMetadataParser.cs
@@ -20,9 +20,9 @@ public interface IMetadataParser
     T Parse<T>(string content);
 
     /// <summary>
-    /// Deserialized a object.
+    /// Deserialized an object.
     /// </summary>
     /// <param name="data"></param>
     /// <param name="path"></param>
     void Export<T>(T data, string path);
-}
\ No newline at end of file
+}
diff --git a/source/Program.cs b/source/Program.cs
index a3fddc8..02cf05c 100644
--- a/source/Program.cs
+++ b/source/Program.cs
@@ -118,7 +118,7 @@ public class Program(ILogger logger)
     }
 
     /// <summary>
-    /// Create a log (normally from Serilog), depending the verbose option
+    /// Create a log (normally from Serilog), depending on the verbose option
     /// </summary>
     /// <param name="verbose"></param>
     /// <returns></returns>
diff --git a/source/ServerHandlers/RegisteredPageRequest.cs b/source/ServerHandlers/RegisteredPageRequest.cs
index 460cc82..4de19a6 100644
--- a/source/ServerHandlers/RegisteredPageRequest.cs
+++ b/source/ServerHandlers/RegisteredPageRequest.cs
@@ -50,7 +50,7 @@ public class RegisteredPageRequest : IServerHandlers
     /// </summary>
     /// <param name="content">The content to inject the reload script into.</param>
     /// <returns>The content with the reload script injected.</returns>
-    private string InjectReloadScript(string content)
+    private static string InjectReloadScript(string content)
     {
         // Read the content of the JavaScript file
         var assembly = Assembly.GetExecutingAssembly();
diff --git a/source/ServerHandlers/StaticFileRequest.cs b/source/ServerHandlers/StaticFileRequest.cs
index 6731f6b..67abd35 100644
--- a/source/ServerHandlers/StaticFileRequest.cs
+++ b/source/ServerHandlers/StaticFileRequest.cs
@@ -50,7 +50,7 @@ public class StaticFileRequest : IServerHandlers
     }
 
     /// <summary>
-    /// Retrieves the content type of a file based on its extension.
+    /// Retrieves the content type of file based on its extension.
     /// If the content type cannot be determined, the default value "application/octet-stream" is returned.
     /// </summary>
     /// <param name="filePath">The path of the file.</param>
-- 
GitLab


From 99ef585f473105da0bbdc70019a5868f9162361e Mon Sep 17 00:00:00 2001
From: Bruno Massa <brmassa@gmail.com>
Date: Tue, 7 May 2024 13:38:44 -0500
Subject: [PATCH 8/8] fix: low severity fixes from Qodana/Rider

---
 Tests/Helpers/StopwatchReporterTests.cs       |  10 +-
 Tests/Models/PageTests.cs                     |  30 +--
 Tests/Models/SiteTests.cs                     |  31 ++--
 Tests/Parser/YAMLParserTests.cs               | 171 ++++++++++--------
 Tests/TestSetup.cs                            |   2 +-
 .../ServerHandlers/RegisteredPageRequest.cs   |  15 +-
 .../RegisteredPageResourceRequest.cs          |  13 +-
 7 files changed, 151 insertions(+), 121 deletions(-)

diff --git a/Tests/Helpers/StopwatchReporterTests.cs b/Tests/Helpers/StopwatchReporterTests.cs
index e6154e8..adde67c 100644
--- a/Tests/Helpers/StopwatchReporterTests.cs
+++ b/Tests/Helpers/StopwatchReporterTests.cs
@@ -24,7 +24,7 @@ public class StopwatchReporterTests
     public void Start_InitializesAndStartsStopwatchForStep()
     {
         // Arrange
-        var stepName = "TestStep";
+        const string stepName = "TestStep";
         var stopwatchReporter = new StopwatchReporter(new LoggerConfiguration().CreateLogger());
 
         // Act
@@ -44,9 +44,9 @@ public class StopwatchReporterTests
     [Fact]
     public void LogReport_CorrectlyLogsElapsedTime()
     {
-        var stepName = "TestStep";
-        var siteTitle = "TestSite";
-        var duration = 123;
+        const string stepName = "TestStep";
+        const string siteTitle = "TestSite";
+        const int duration = 123;
 
         var stopwatchReporter = new StopwatchReporter(_logger);
         stopwatchReporter.Start(stepName);
@@ -68,7 +68,7 @@ public class StopwatchReporterTests
     [Fact]
     public void Stop_ThrowsExceptionWhenStopCalledWithoutStart()
     {
-        var stepName = "TestStep";
+        const string stepName = "TestStep";
         var stopwatchReporter = new StopwatchReporter(_logger);
 
         // Don't call Start for stepName
diff --git a/Tests/Models/PageTests.cs b/Tests/Models/PageTests.cs
index 706819f..d3d0516 100644
--- a/Tests/Models/PageTests.cs
+++ b/Tests/Models/PageTests.cs
@@ -8,7 +8,7 @@ namespace Tests.Models;
 
 public class PageTests : TestSetup
 {
-    private const string Markdown1Const = @"
+    private const string Markdown1Const = """
 # word01 word02
 
 word03 word04 word05 6 7 eight
@@ -17,19 +17,25 @@ word03 word04 word05 6 7 eight
 
 ```cs
 console.WriteLine('hello word')
-```";
-    private const string Markdown2Const = @"
+```
+""";
+    private const string Markdown2Const = """
 # word01 word02
 
-word03 word04 word05 6 7 [eight](https://example.com)";
-    private const string MarkdownPlain1Const = @"word01 word02
-word03 word04 word05 6 7 eight
-nine
-console.WriteLine('hello word')
-";
-    private const string MarkdownPlain2Const = @"word01 word02
-word03 word04 word05 6 7 eight
-";
+word03 word04 word05 6 7 [eight](https://example.com)
+""";
+    private const string MarkdownPlain1Const = """
+                                               word01 word02
+                                               word03 word04 word05 6 7 eight
+                                               nine
+                                               console.WriteLine('hello word')
+
+                                               """;
+    private const string MarkdownPlain2Const = """
+                                               word01 word02
+                                               word03 word04 word05 6 7 eight
+
+                                               """;
 
     [Theory]
     [InlineData("Test Title", "/path/to/file.md", "file", "/path/to")]
diff --git a/Tests/Models/SiteTests.cs b/Tests/Models/SiteTests.cs
index 12ab863..ee91f87 100644
--- a/Tests/Models/SiteTests.cs
+++ b/Tests/Models/SiteTests.cs
@@ -1,4 +1,3 @@
-using SuCoS;
 using SuCoS.Helpers;
 using SuCoS.Models;
 using SuCoS.Models.CommandLineOptions;
@@ -12,17 +11,12 @@ namespace Tests.Models;
 /// </summary>
 public class SiteTests : TestSetup
 {
-    private readonly IFileSystem _fs;
-
-    public SiteTests()
-    {
-        _fs = new FileSystem();
-    }
+    private readonly IFileSystem _fs = new FileSystem();
 
     [Theory]
     [InlineData("test01.md")]
     [InlineData("date-ok.md")]
-    public void ScanAllMarkdownFiles_ShouldCountainFilenames(string fileName)
+    public void ScanAllMarkdownFiles_ShouldContainFilenames(string fileName)
     {
         var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileName);
         var siteFullPath = Path.GetFullPath(Path.Combine(TestSitesPath, TestSitePathConst01));
@@ -56,7 +50,10 @@ public class SiteTests : TestSetup
         // Assert
         Assert.NotNull(Site.Home);
         Assert.True(Site.Home.IsHome);
-        _ = Assert.Single(Site.OutputReferences.Values.Where(output => output is IPage page && page.IsHome));
+        _ = Assert.Single(Site.OutputReferences.Values.Where(output => output is IPage
+        {
+            IsHome: true
+        }));
     }
 
     [Theory]
@@ -75,7 +72,10 @@ public class SiteTests : TestSetup
         Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        Assert.Equal(expectedQuantity, Site.OutputReferences.Values.Where(output => output is IPage page && page.IsSection).Count());
+        Assert.Equal(expectedQuantity, Site.OutputReferences.Values.Count(output => output is IPage
+        {
+            IsSection: true
+        }));
     }
 
     [Theory]
@@ -95,7 +95,7 @@ public class SiteTests : TestSetup
         Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        Assert.Equal(expectedQuantity, Site.OutputReferences.Values.Where(output => output is IPage).Count());
+        Assert.Equal(expectedQuantity, Site.OutputReferences.Values.Count(output => output is IPage));
     }
 
     [Theory]
@@ -115,7 +115,10 @@ public class SiteTests : TestSetup
         Site.ParseAndScanSourceFiles(_fs, null);
 
         // Assert
-        Assert.Equal(expectedQuantity, Site.OutputReferences.Values.Where(output => output is IPage page && page.IsPage).Count());
+        Assert.Equal(expectedQuantity, Site.OutputReferences.Values.Count(output => output is IPage
+        {
+            IsPage: true
+        }));
     }
 
     [Fact]
@@ -306,7 +309,7 @@ public class SiteTests : TestSetup
     "<p>Test Content 1</p>\n",
     "SINGLE-<p>Test Content 1</p>\n",
     "BASEOF-SINGLE-<p>Test Content 1</p>\n")]
-    public void Page_Content_ShouldReturnThemeContent(string url, string expectedContentPreRendered, string expectedContent, string expectedOutputfile)
+    public void Page_Content_ShouldReturnThemeContent(string url, string expectedContentPreRendered, string expectedContent, string expectedOutputFile)
     {
         GenerateOptions options = new()
         {
@@ -325,6 +328,6 @@ public class SiteTests : TestSetup
         Assert.NotNull(page);
         Assert.Equal(expectedContentPreRendered, page.ContentPreRendered);
         Assert.Equal(expectedContent, page.Content);
-        Assert.Equal(expectedOutputfile, page.CompleteContent);
+        Assert.Equal(expectedOutputFile, page.CompleteContent);
     }
 }
diff --git a/Tests/Parser/YAMLParserTests.cs b/Tests/Parser/YAMLParserTests.cs
index d073a83..c63fdd3 100644
--- a/Tests/Parser/YAMLParserTests.cs
+++ b/Tests/Parser/YAMLParserTests.cs
@@ -10,59 +10,68 @@ public class YamlParserTests : TestSetup
 {
     private readonly YamlParser _parser = new();
 
-    private const string PageFrontMatterConst = @"Title: Test Title
-Type: post
-Date: 2023-07-01
-LastMod: 2023-06-01
-PublishDate: 2023-06-01
-ExpiryDate: 2024-06-01
-Tags:
-  - Test
-  - Real Data
-Categories:
-  - Test
-  - Real Data
-NestedData:
-  Level2:
-    - Test
-    - Real Data
-customParam: Custom Value
-Params:
-  ParamsCustomParam: Custom Value
-  ParamsNestedData:
-    Level2:
-      - Test
-      - Real Data
-";
-    private const string PageMarkdownConst = @"
-# Real Data Test
-
-This is a test using real data. Real Data Test
-";
-    private const string SiteContentConst = @"
-Title: My Site
-BaseURL: https://www.example.com/
-Description: Tastiest C# Static Site Generator of the World
-Copyright: Copyright message
-customParam: Custom Value
-NestedData:
-  Level2:
-    - Test
-    - Real Data
-Params:
-  ParamsCustomParam: Custom Value
-  ParamsNestedData:
-    Level2:
-      - Test
-      - Real Data
-";
+    private const string PageFrontMatterConst = """
+                                                Title: Test Title
+                                                Type: post
+                                                Date: 2023-07-01
+                                                LastMod: 2023-06-01
+                                                PublishDate: 2023-06-01
+                                                ExpiryDate: 2024-06-01
+                                                Tags:
+                                                  - Test
+                                                  - Real Data
+                                                Categories:
+                                                  - Test
+                                                  - Real Data
+                                                NestedData:
+                                                  Level2:
+                                                    - Test
+                                                    - Real Data
+                                                customParam: Custom Value
+                                                Params:
+                                                  ParamsCustomParam: Custom Value
+                                                  ParamsNestedData:
+                                                    Level2:
+                                                      - Test
+                                                      - Real Data
+
+                                                """;
+    private const string PageMarkdownConst = """
+
+                                             # Real Data Test
+
+                                             This is a test using real data. Real Data Test
+
+                                             """;
+    private const string SiteContentConst = """
+
+                                            Title: My Site
+                                            BaseURL: https://www.example.com/
+                                            Description: Tastiest C# Static Site Generator of the World
+                                            Copyright: Copyright message
+                                            customParam: Custom Value
+                                            NestedData:
+                                              Level2:
+                                                - Test
+                                                - Real Data
+                                            Params:
+                                              ParamsCustomParam: Custom Value
+                                              ParamsNestedData:
+                                                Level2:
+                                                  - Test
+                                                  - Real Data
+
+                                            """;
     private const string FileFullPathConst = "test.md";
     private const string FileRelativePathConst = "test.md";
-    private readonly string _pageContent = @$"---
-{PageFrontMatterConst}
----
-{PageMarkdownConst}";
-    private static readonly string[] Expected = new[] { "Test", "Real Data" };
+    private const string PageContent = $"""
+                                         ---
+                                         {PageFrontMatterConst}
+                                         ---
+                                         {PageMarkdownConst}
+                                         """;
+
+    private static readonly string[] Expected = ["Test", "Real Data"];
 
     [Fact]
     public void GetSection_ShouldReturnFirstFolderName()
@@ -78,14 +87,18 @@ Params:
     }
 
     [Theory]
-    [InlineData(@"---
-Title: Test Title
----
-", "Test Title")]
-    [InlineData(@"---
-Date: 2023-04-01
----
-", "")]
+    [InlineData("""
+                ---
+                Title: Test Title
+                ---
+
+                """, "Test Title")]
+    [InlineData("""
+                ---
+                Date: 2023-04-01
+                ---
+
+                """, "")]
     public void ParseFrontMatter_ShouldParseTitleCorrectly(string fileContent, string expectedTitle)
     {
         // Arrange
@@ -96,14 +109,18 @@ Date: 2023-04-01
     }
 
     [Theory]
-    [InlineData(@"---
-Date: 2023-01-01
----
-", "2023-01-01")]
-    [InlineData(@"---
-Date: 2023/01/01
----
-", "2023-01-01")]
+    [InlineData("""
+                ---
+                Date: 2023-01-01
+                ---
+
+                """, "2023-01-01")]
+    [InlineData("""
+                ---
+                Date: 2023/01/01
+                ---
+
+                """, "2023-01-01")]
     public void ParseFrontMatter_ShouldParseDateCorrectly(string fileContent, string expectedDateString)
     {
         // Arrange
@@ -126,7 +143,7 @@ Date: 2023/01/01
         var expectedExpiryDate = DateTime.Parse("2024-06-01", CultureInfo.InvariantCulture);
 
         // Act
-        var frontMatter = FrontMatter.Parse(FileRelativePathConst, FileFullPathConst, _parser, _pageContent);
+        var frontMatter = FrontMatter.Parse(FileRelativePathConst, FileFullPathConst, _parser, PageContent);
 
         // Assert
         Assert.Equal("Test Title", frontMatter.Title);
@@ -141,10 +158,12 @@ Date: 2023/01/01
     public void ParseFrontMatter_ShouldThrowFormatException_WhenInvalidYAMLSyntax()
     {
         // Arrange
-        const string fileContent = @"---
-Title
----
-";
+        const string fileContent = """
+                                   ---
+                                   Title
+                                   ---
+
+                                   """;
 
         // Assert
         Assert.Throws<FormatException>(() =>
@@ -169,7 +188,7 @@ Title
     public void ParseParams_ShouldFillParamsWithNonMatchingFields()
     {
         // Arrange
-        var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, _parser, _pageContent);
+        var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, _parser, PageContent);
         var page = new Page(frontMatter, Site);
 
         // Assert
@@ -182,7 +201,7 @@ Title
     {
         // Arrange
         var date = DateTime.Parse("2023-07-01", CultureInfo.InvariantCulture);
-        var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, _parser, _pageContent);
+        var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, _parser, PageContent);
         Page page = new(frontMatter, Site);
 
         // Act
@@ -196,7 +215,7 @@ Title
     public void ParseFrontMatter_ShouldCreateTags()
     {
         // Arrange
-        var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, _parser, _pageContent);
+        var frontMatter = FrontMatter.Parse(string.Empty, string.Empty, _parser, PageContent);
         Page page = new(frontMatter, Site);
 
         // Act
@@ -222,7 +241,7 @@ Title
     public void ParseYAML_ShouldSplitTheMetadata()
     {
         // Act
-        var (metadata, rawContent) = _parser.SplitFrontMatter(_pageContent);
+        var (metadata, rawContent) = _parser.SplitFrontMatter(PageContent);
 
         // Assert
         Assert.Equal(PageFrontMatterConst.TrimEnd(), metadata);
diff --git a/Tests/TestSetup.cs b/Tests/TestSetup.cs
index 6114f15..a565294 100644
--- a/Tests/TestSetup.cs
+++ b/Tests/TestSetup.cs
@@ -28,7 +28,7 @@ public class TestSetup
     private readonly SiteSettings _siteSettingsMock = Substitute.For<SiteSettings>();
     protected readonly ILogger LoggerMock = Substitute.For<ILogger>();
     protected readonly ISystemClock SystemClockMock = Substitute.For<ISystemClock>();
-    protected readonly IFrontMatter FrontMatterMock = new FrontMatter()
+    protected readonly IFrontMatter FrontMatterMock = new FrontMatter
     {
         Title = TitleConst,
         SourceRelativePath = SourcePathConst
diff --git a/source/ServerHandlers/RegisteredPageRequest.cs b/source/ServerHandlers/RegisteredPageRequest.cs
index 4de19a6..0d53fe4 100644
--- a/source/ServerHandlers/RegisteredPageRequest.cs
+++ b/source/ServerHandlers/RegisteredPageRequest.cs
@@ -32,16 +32,17 @@ public class RegisteredPageRequest : IServerHandlers
     {
         ArgumentNullException.ThrowIfNull(response);
 
-        if (_site.OutputReferences.TryGetValue(requestPath, out var output) && output is IPage page)
+        if (!_site.OutputReferences.TryGetValue(requestPath, out var output) ||
+            output is not IPage page)
         {
-            var content = page.CompleteContent;
-            content = InjectReloadScript(content);
-            await using var writer = new StreamWriter(response.OutputStream, leaveOpen: true);
-            await writer.WriteAsync(content).ConfigureAwait(false);
-            return "dict";
+            return "404";
         }
+        var content = page.CompleteContent;
+        content = InjectReloadScript(content);
+        await using var writer = new StreamWriter(response.OutputStream, leaveOpen: true);
+        await writer.WriteAsync(content).ConfigureAwait(false);
+        return "dict";
 
-        return "404";
     }
 
     /// <summary>
diff --git a/source/ServerHandlers/RegisteredPageResourceRequest.cs b/source/ServerHandlers/RegisteredPageResourceRequest.cs
index ec94517..0f27243 100644
--- a/source/ServerHandlers/RegisteredPageResourceRequest.cs
+++ b/source/ServerHandlers/RegisteredPageResourceRequest.cs
@@ -31,14 +31,15 @@ public class RegisteredPageResourceRequest : IServerHandlers
     {
         ArgumentNullException.ThrowIfNull(response);
 
-        if (_site.OutputReferences.TryGetValue(requestPath, out var output) && output is IResource resource)
+        if (!_site.OutputReferences.TryGetValue(requestPath, out var output) ||
+            output is not IResource resource)
         {
-            response.ContentType = resource.MimeType;
-            await using var fileStream = new FileStream(resource.SourceFullPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-            await fileStream.CopyToAsync(response.OutputStream).ConfigureAwait(false);
-            return "resource";
+            return "404";
         }
+        response.ContentType = resource.MimeType;
+        await using var fileStream = new FileStream(resource.SourceFullPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+        await fileStream.CopyToAsync(response.OutputStream).ConfigureAwait(false);
+        return "resource";
 
-        return "404";
     }
 }
-- 
GitLab