diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..adaa9a5
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,57 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  frontend:
+    name: Frontend build
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: src/frontend
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+          cache-dependency-path: src/frontend/package-lock.json
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build frontend
+        run: npm run build
+
+  backend:
+    name: Backend build and tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.x
+
+      - name: Restore backend
+        run: dotnet restore ThesisValidator.sln
+
+      - name: Build backend
+        run: dotnet build src/backend/ThesisValidator.Api.csproj --configuration Release --no-restore
+
+      - name: Run backend tests
+        run: dotnet test tests/backend.Tests/ThesisValidator.Api.Tests.csproj --configuration Release --no-restore --verbosity normal
diff --git a/.gitignore b/.gitignore
index 63ce472..59f437b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,75 +1,13 @@
-/backend.Tests/bin
+tests/backend.Tests/bin
+/.dotnet/
+/.dotnet-home/
+/.codex-*
 /.idea
-/backend.Tests/obj
-/backend/.idea
-/backend/bin
-/backend/obj
-backend/output/hello_validated_20260201_085806.docx
-backend/output/test_validated_20260130_023857.zip
-backend/output/test_validated_20260131_190122.docx
-backend/output/test_validated_20260201_085634.docx
-backend/output/test_validated_20260130_023857/\[Content_Types].xml
-backend/output/test_validated_20260130_023857/hello.docx
-backend/output/test_validated_20260130_023857/_rels/.rels
-backend/output/test_validated_20260130_023857/customXml/item1.xml
-backend/output/test_validated_20260130_023857/customXml/item2.xml
-backend/output/test_validated_20260130_023857/customXml/item3.xml
-backend/output/test_validated_20260130_023857/customXml/item4.xml
-backend/output/test_validated_20260130_023857/customXml/itemProps1.xml
-backend/output/test_validated_20260130_023857/customXml/itemProps2.xml
-backend/output/test_validated_20260130_023857/customXml/itemProps3.xml
-backend/output/test_validated_20260130_023857/customXml/itemProps4.xml
-backend/output/test_validated_20260130_023857/customXml/_rels/item1.xml.rels
-backend/output/test_validated_20260130_023857/customXml/_rels/item2.xml.rels
-backend/output/test_validated_20260130_023857/customXml/_rels/item3.xml.rels
-backend/output/test_validated_20260130_023857/customXml/_rels/item4.xml.rels
-backend/output/test_validated_20260130_023857/docProps/app.xml
-backend/output/test_validated_20260130_023857/docProps/core.xml
-backend/output/test_validated_20260130_023857/docProps/custom.xml
-backend/output/test_validated_20260130_023857/hello/\[Content_Types].xml
-backend/output/test_validated_20260130_023857/hello/_rels/.rels
-backend/output/test_validated_20260130_023857/hello/customXml/item1.xml
-backend/output/test_validated_20260130_023857/hello/customXml/itemProps1.xml
-backend/output/test_validated_20260130_023857/hello/customXml/_rels/item1.xml.rels
-backend/output/test_validated_20260130_023857/hello/docProps/app.xml
-backend/output/test_validated_20260130_023857/hello/docProps/core.xml
-backend/output/test_validated_20260130_023857/hello/word/document.xml
-backend/output/test_validated_20260130_023857/hello/word/fontTable.xml
-backend/output/test_validated_20260130_023857/hello/word/settings.xml
-backend/output/test_validated_20260130_023857/hello/word/styles.xml
-backend/output/test_validated_20260130_023857/hello/word/webSettings.xml
-backend/output/test_validated_20260130_023857/hello/word/_rels/document.xml.rels
-backend/output/test_validated_20260130_023857/hello/word/theme/theme1.xml
-backend/output/test_validated_20260130_023857/word/comments.xml
-backend/output/test_validated_20260130_023857/word/document.xml
-backend/output/test_validated_20260130_023857/word/endnotes.xml
-backend/output/test_validated_20260130_023857/word/fontTable.xml
-backend/output/test_validated_20260130_023857/word/footer1.xml
-backend/output/test_validated_20260130_023857/word/footnotes.xml
-backend/output/test_validated_20260130_023857/word/numbering.xml
-backend/output/test_validated_20260130_023857/word/settings.xml
-backend/output/test_validated_20260130_023857/word/styles.xml
-backend/output/test_validated_20260130_023857/word/webSettings.xml
-backend/output/test_validated_20260130_023857/word/_rels/document.xml.rels
-backend/output/test_validated_20260130_023857/word/glossary/document.xml
-backend/output/test_validated_20260130_023857/word/glossary/fontTable.xml
-backend/output/test_validated_20260130_023857/word/glossary/settings.xml
-backend/output/test_validated_20260130_023857/word/glossary/styles.xml
-backend/output/test_validated_20260130_023857/word/glossary/webSettings.xml
-backend/output/test_validated_20260130_023857/word/glossary/_rels/document.xml.rels
-backend/output/test_validated_20260130_023857/word/media/image1.png
-backend/output/test_validated_20260130_023857/word/media/image2.png
-backend/output/test_validated_20260130_023857/word/media/image3.png
-backend/output/test_validated_20260130_023857/word/theme/theme1.xml
-backend/output/hello.docx
-backend.Tests/Fixtures/test.docx
-/backend.Tests/Fixtures
-frontend/.vscode/extensions.json
-frontend/.vscode/launch.json
-frontend/.vscode/tasks.json
-frontend/.vscode/extensions.json
-frontend/.vscode/launch.json
-frontend/.vscode/tasks.json
-presentation/architecture.md
-presentation/architecture.pdf
-presentation/architecture.pptx
+tests/backend.Tests/obj
+src/backend/.idea
+src/backend/bin
+src/backend/obj
+src/backend/output/
+src/frontend/.vscode/extensions.json
+src/frontend/.vscode/launch.json
+src/frontend/.vscode/tasks.json
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..bab7372
--- /dev/null
+++ b/README.md
@@ -0,0 +1,199 @@
+# Thesis Validator
+
+A full-stack web app for validating `.docx` thesis documents against formatting, layout, structure, and grammar rules.
+
+## Demo
+
+Screenshots from the current app:
+
+![Main page](docs/screenshots/MainPage.png)
+
+![Rule settings](docs/screenshots/RuleSettings.png)
+
+![Validation results](docs/screenshots/ValidationResult.png)
+
+## Overview
+
+Thesis Validator helps students check Word thesis documents before submission. Users upload a `.docx` file, choose validation rules, review grouped issues, and can download an annotated copy with comments placed in the document.
+
+I built this project to practice a realistic full-stack workflow: document parsing, rule-based validation, API design, frontend state management, and automated backend testing. The app is useful for students who want a faster way to catch formatting and structure problems that are easy to miss during manual review.
+
+## Features
+
+- Upload and validate `.docx` thesis files from an Angular interface.
+- Select validation rules by category before running a check.
+- Validate formatting rules such as font family, single spaces, title punctuation, and text justification.
+- Check layout and structure rules including paragraph spacing, indentation, heading depth, table of contents, empty sections, and figure captions.
+- Run grammar checks through a local LanguageTool service.
+- Skip front matter before the table of contents and skip Word text boxes when needed.
+- View validation results grouped by category with error and warning counts.
+- Download an annotated `.docx` file with comments marking detected issues.
+
+## Tech Stack
+
+- Frontend: Angular 18, TypeScript, RxJS, Tailwind CSS, lucide-angular
+- Backend: ASP.NET Core 9, C#, Minimal APIs, Swagger/OpenAPI
+- Database: None
+- Auth: None
+- Testing: xUnit, Moq, coverlet, Angular/Karma test setup
+- Deployment: GitHub Actions CI for frontend build and backend build/tests
+- Other: Docker Compose, LanguageTool, DocumentFormat.OpenXml, Postman collection
+
+## Getting Started
+
+### 1. Clone the repository
+
+```bash
+git clone <repository-url>
+cd thesis-validator
+```
+
+### 2. Install dependencies
+
+Install the frontend packages:
+
+```bash
+cd src/frontend
+npm ci
+```
+
+Restore the .NET solution from the repository root:
+
+```bash
+cd ../..
+dotnet restore ThesisValidator.sln
+```
+
+### 3. Configure environment variables
+
+The default local configuration works for basic development. The backend reads its local settings from `src/backend/appsettings.json` and `src/backend/appsettings.Development.json`.
+
+Start the local grammar service before using grammar validation:
+
+```bash
+docker compose -f docker/docker-compose.yml up -d
+```
+
+### 4. Run the development servers
+
+Start the backend API from the repository root:
+
+```bash
+dotnet run --project src/backend/ThesisValidator.Api.csproj --launch-profile http
+```
+
+In a second terminal, start the Angular frontend:
+
+```bash
+cd src/frontend
+npm start
+```
+
+### 5. Open the app locally
+
+- Frontend: `http://localhost:4200`
+- Backend API: `http://localhost:5213`
+- Swagger UI: `http://localhost:5213/swagger`
+- LanguageTool service: `http://localhost:8010`
+
+The Angular dev server proxies `/api` requests to `http://localhost:5213` through `src/frontend/proxy.conf.json`.
+
+## Environment Variables
+
+| Variable | Purpose | Required |
+|---|---|---|
+| `ASPNETCORE_ENVIRONMENT` | Sets the backend environment. The launch profile sets this to `Development` locally. | No |
+| `LanguageTool__BaseUrl` | Overrides the LanguageTool service URL. Defaults to `http://localhost:8010`. | No |
+| `Cors__AllowedOrigins__0` | Allows a frontend origin outside the default development origin. Defaults to `http://localhost:4200` in development. | No |
+
+No secrets are required for basic local setup.
+
+## Available Scripts
+
+Frontend commands from `src/frontend/package.json`:
+
+```bash
+npm start
+npm run build
+npm run watch
+npm test
+```
+
+Backend and solution commands:
+
+```bash
+dotnet restore ThesisValidator.sln
+dotnet build src/backend/ThesisValidator.Api.csproj
+dotnet test tests/backend.Tests/ThesisValidator.Api.Tests.csproj
+dotnet run --project src/backend/ThesisValidator.Api.csproj --launch-profile http
+```
+
+Local service command:
+
+```bash
+docker compose -f docker/docker-compose.yml up -d
+```
+
+## Project Structure
+
+```text
+.
+|-- .github/workflows/ci.yml
+|-- docker/docker-compose.yml
+|-- docs/screenshots/
+|-- src/
+|   |-- backend/
+|   |   |-- Annotation/
+|   |   |-- Application/Validation/
+|   |   |-- DocumentProcessing/
+|   |   |-- Endpoints/Documents/
+|   |   |-- Infrastructure/LanguageTool/
+|   |   |-- Rules/
+|   |   |-- Program.cs
+|   |   `-- ThesisValidator.Api.csproj
+|   `-- frontend/
+|       |-- src/app/components/
+|       |-- src/app/models/
+|       |-- src/app/services/
+|       |-- proxy.conf.json
+|       `-- package.json
+|-- tests/backend.Tests/
+|-- ThesisValidator.postman_collection.json
+`-- ThesisValidator.sln
+```
+
+## Architecture / Implementation Notes
+
+The backend uses ASP.NET Core Minimal APIs. Document routes are grouped under `/api/documents` and include endpoints for validation, annotated downloads, available rules, and health checks.
+
+Validation is rule-based. Each rule implements the shared validation rule framework and is registered through dependency injection by scanning the backend assembly. Rules are grouped around formatting, layout, structure, and language checks.
+
+Document processing uses `DocumentFormat.OpenXml` to inspect Word documents, extract text, resolve formatting, detect headings, analyze lists, detect figure captions, and apply comments to annotated output files.
+
+Grammar validation calls a local LanguageTool service through an injected HTTP client. Docker Compose provides the service for local development.
+
+The Angular frontend uses standalone components, signals, computed state, and a `ValidationService` for API calls. The main app state moves between upload, validating, and results views. Validation results are normalized on the client before rendering.
+
+The repository includes backend tests with xUnit and fixture `.docx` files. GitHub Actions builds the Angular frontend and runs the backend build and tests on pushes and pull requests to `main`.
+
+## What I Learned
+
+- I learned how to design a rule-based validation pipeline that can grow without hard-coding every rule into the API layer.
+- I practiced reading and annotating Word documents with OpenXML instead of treating uploaded files as plain text.
+- I learned how to connect an Angular dev server to a local ASP.NET Core API through a proxy configuration.
+- I practiced separating document parsing, validation rules, API responses, and frontend rendering into smaller pieces.
+- I learned how to test document validation behavior with real `.docx` fixtures.
+
+## Future Improvements
+
+- Add more frontend unit tests around file upload, rule selection, and result rendering.
+- Add end-to-end tests for the upload-to-annotated-download workflow.
+- Improve accessibility for keyboard navigation, focus states, and screen reader labels.
+- Add CI checks for frontend tests once the test suite is expanded.
+- Add deployment configuration and replace the demo placeholder with a hosted link.
+- Add clearer validation profiles for different university thesis requirements.
+- Document how to add a new backend validation rule.
+
+## License
+
+> No license has been added yet.
diff --git a/thesis-validator.sln b/ThesisValidator.sln
similarity index 88%
rename from thesis-validator.sln
rename to ThesisValidator.sln
index 71d617a..a13ed12 100644
--- a/thesis-validator.sln
+++ b/ThesisValidator.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.2.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "backend", "backend\backend.csproj", "{B5CEE1AB-68C5-FCEC-EA61-653FFB609ED2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThesisValidator.Api", "src\backend\ThesisValidator.Api.csproj", "{B5CEE1AB-68C5-FCEC-EA61-653FFB609ED2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "backend.Tests", "backend.Tests\backend.Tests.csproj", "{871FB478-6040-4FAA-A744-1F98C040DB41}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThesisValidator.Api.Tests", "tests\backend.Tests\ThesisValidator.Api.Tests.csproj", "{871FB478-6040-4FAA-A744-1F98C040DB41}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/backend.Tests/Exploratory/FontExplorationTests.cs b/backend.Tests/Exploratory/FontExplorationTests.cs
deleted file mode 100644
index 3943302..0000000
--- a/backend.Tests/Exploratory/FontExplorationTests.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using backend.Models;
-using backend.Tests.Helpers;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using Xunit.Abstractions;
-
-namespace backend.Tests.Exploratory;
-
-public class FontExplorationTests
-{
-  private readonly ITestOutputHelper _output;
-  public FontExplorationTests(ITestOutputHelper output)
-  {
-    _output = output;
-  }
-
-  [Fact]
-  public void Explore_Fonts()
-  {
-    using var doc = DocxTestHelper.OpenDocxAsRead("Fonts/fonts.docx");
-    var body = doc.MainDocumentPart.Document.Body;
-
-    foreach (var paragraph in body.Elements<Paragraph>())
-    {
-      Console.WriteLine("paragraph:", paragraph);
-      foreach (var text in paragraph.Descendants<Text>())
-      {
-        _output.WriteLine(text.Text);
-      }
-    }
-  }
-
-  [Fact]
-  public void Print_text_with_font_info()
-  {
-    using var doc = DocxTestHelper.OpenDocxAsRead("test.docx");
-
-    var errros = ValidateTimesNewRoman(doc).ToList();
-    foreach (var error in errros)
-    {
-      _output.WriteLine(error.Message);
-    }
-    _output.WriteLine($"Done Errors Count: {errros.Count.ToString()}");
-
-  }
-  public IEnumerable<ValidationResult> ValidateTimesNewRoman(
-    WordprocessingDocument doc)
-  {
-    var body = doc.MainDocumentPart!.Document.Body!;
-    var errors = new List<ValidationResult>();
-
-    int paragraphIndex = 0;
-
-    foreach (var paragraph in body.Elements<Paragraph>())
-    {
-      paragraphIndex++;
-
-      foreach (var run in paragraph.Elements<Run>())
-      {
-        var text = string.Concat(
-          run.Elements<Text>().Select(t => t.Text));
-
-        if (string.IsNullOrWhiteSpace(text))
-          continue;
-
-        var font = ResolveEffectiveFont(doc, paragraph, run);
-
-        if (!string.Equals(font, "Times New Roman",
-              StringComparison.OrdinalIgnoreCase))
-        {
-          errors.Add(new ValidationResult
-          {
-            IsError = true,
-            Message =
-              $"Invalid font '{font}' in paragraph {paragraphIndex} text: {text}",
-          });
-        }
-      }
-    }
-
-    return errors;
-  }
-  string? ResolveEffectiveFont(
-    WordprocessingDocument doc,
-    Paragraph paragraph,
-    Run run)
-  {
-    // 1. Run-level font
-    var runFont = run
-      .RunProperties?
-      .RunFonts?
-      .Ascii;
-
-    if (!string.IsNullOrEmpty(runFont))
-      return runFont;
-
-    // 2. Paragraph style font
-    var paraFont = GetParagraphStyleFont(doc, paragraph);
-    if (!string.IsNullOrEmpty(paraFont))
-      return paraFont;
-
-    // 3. Default document font
-    return GetDefaultFont(doc);
-  }
-
-  string? GetParagraphStyleFont(
-    WordprocessingDocument doc,
-    Paragraph paragraph)
-  {
-    var styleId = paragraph
-      .ParagraphProperties?
-      .ParagraphStyleId?
-      .Val;
-
-    if (styleId == null)
-      return null;
-
-    var styles = doc.MainDocumentPart?.StyleDefinitionsPart?.Styles;
-
-    var style = styles?
-      .Elements<Style>()
-      .FirstOrDefault(s => s.StyleId == styleId);
-
-    return style?
-      .StyleRunProperties?
-      .RunFonts?
-      .Ascii;
-  }
-
-  string? GetDefaultFont(WordprocessingDocument doc)
-  {
-    var styles = doc.MainDocumentPart?.StyleDefinitionsPart?.Styles;
-
-    var defaultStyle = styles?
-      .Elements<Style>()
-      .FirstOrDefault(s => s.Type == StyleValues.Paragraph && s.Default);
-
-    return defaultStyle?
-      .StyleRunProperties?
-      .RunFonts?
-      .Ascii;
-  }
-
-
-
-}
\ No newline at end of file
diff --git a/backend.Tests/Exploratory/LineSpacingExplorationTests.cs b/backend.Tests/Exploratory/LineSpacingExplorationTests.cs
deleted file mode 100644
index 9a056b7..0000000
--- a/backend.Tests/Exploratory/LineSpacingExplorationTests.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using backend.Tests.Helpers;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using Xunit.Abstractions;
-
-namespace backend.Tests.Exploratory;
-
-public class LineSpacingExplorationTests
-{
-    private readonly ITestOutputHelper _output;
-
-    public LineSpacingExplorationTests(ITestOutputHelper output)
-    {
-        _output = output;
-    }
-
-    [Fact(Skip = "Exploratory test depends on local DOCX fixtures.")]
-    public void Explore_LineSpacing_Values()
-    {
-        using var doc = DocxTestHelper.OpenDocxAsRead("WrongIndentANDSpacing/hello - Copy.docx");
-        var body = doc.MainDocumentPart?.Document.Body;
-
-        if (body == null)
-        {
-            _output.WriteLine("Body is null");
-            return;
-        }
-
-        int paragraphIndex = 0;
-        foreach (var paragraph in body.Elements<Paragraph>())
-        {
-            paragraphIndex++;
-            var spacing = paragraph.ParagraphProperties?.SpacingBetweenLines;
-
-            var text = string.Join("", paragraph.Descendants<Text>().Select(t => t.Text));
-            var preview = text.Length > 50 ? text.Substring(0, 50) + "..." : text;
-
-            _output.WriteLine($"=== Paragraph {paragraphIndex}: \"{preview}\" ===");
-
-            if (spacing == null)
-            {
-                _output.WriteLine("  No SpacingBetweenLines element");
-                continue;
-            }
-
-            _output.WriteLine($"  Line: {spacing.Line?.Value ?? "null"}");
-            _output.WriteLine($"  LineRule: {spacing.LineRule?.Value.ToString() ?? "null"}");
-            _output.WriteLine($"  Before: {spacing.Before?.Value ?? "null"}");
-            _output.WriteLine($"  After: {spacing.After?.Value ?? "null"}");
-            _output.WriteLine($"  BeforeLines: {spacing.BeforeLines?.Value.ToString() ?? "null"}");
-            _output.WriteLine($"  AfterLines: {spacing.AfterLines?.Value.ToString() ?? "null"}");
-        }
-    }
-
-    [Fact(Skip = "Exploratory test depends on local DOCX fixtures.")]
-    public void Explore_Output_Docx()
-    {
-        // Direct path to fixtures hello.docx
-        using var doc = WordprocessingDocument.Open(
-            @"C:\Users\envv\Documents\GitHub\thesis-validator\backend.Tests\Fixtures\hello.docx", false);
-        var body = doc.MainDocumentPart?.Document.Body;
-
-        if (body == null)
-        {
-            _output.WriteLine("Body is null");
-            return;
-        }
-
-        int paragraphIndex = 0;
-        foreach (var paragraph in body.Elements<Paragraph>())
-        {
-            paragraphIndex++;
-            var spacing = paragraph.ParagraphProperties?.SpacingBetweenLines;
-            var styleId = paragraph.ParagraphProperties?.ParagraphStyleId?.Val?.Value;
-
-            var text = string.Join("", paragraph.Descendants<Text>().Select(t => t.Text));
-            var preview = text.Length > 50 ? text.Substring(0, 50) + "..." : text;
-
-            _output.WriteLine($"=== Paragraph {paragraphIndex}: \"{preview}\" ===");
-            _output.WriteLine($"  StyleId: {styleId ?? "null (uses default)"}");
-
-            if (spacing == null)
-            {
-                _output.WriteLine("  No SpacingBetweenLines element");
-                continue;
-            }
-
-            _output.WriteLine($"  Line: {spacing.Line?.Value ?? "null"}");
-            _output.WriteLine($"  LineRule: {spacing.LineRule?.Value.ToString() ?? "null"}");
-            _output.WriteLine($"  LineRule HasValue: {spacing.LineRule?.HasValue}");
-            _output.WriteLine($"  LineRule == Auto: {spacing.LineRule?.Value == LineSpacingRuleValues.Auto}");
-            _output.WriteLine($"  Before: {spacing.Before?.Value ?? "null"}");
-            _output.WriteLine($"  After: {spacing.After?.Value ?? "null"}");
-        }
-    }
-
-    [Fact(Skip = "Exploratory test depends on local DOCX fixtures.")]
-    public void Explore_Styles_In_HelloDocx()
-    {
-        using var doc = WordprocessingDocument.Open(
-            @"C:\Users\envv\Documents\GitHub\thesis-validator\backend.Tests\Fixtures\hello.docx", false);
-
-        var styles = doc.MainDocumentPart?.StyleDefinitionsPart?.Styles;
-        if (styles == null)
-        {
-            _output.WriteLine("No styles found");
-            return;
-        }
-
-        _output.WriteLine("=== Document Defaults ===");
-        var docDefaults = styles.DocDefaults?.ParagraphPropertiesDefault?.ParagraphPropertiesBaseStyle?.SpacingBetweenLines;
-        if (docDefaults != null)
-        {
-            _output.WriteLine($"  DocDefaults Line: {docDefaults.Line?.Value ?? "null"}");
-            _output.WriteLine($"  DocDefaults LineRule: {docDefaults.LineRule?.Value.ToString() ?? "null"}");
-            _output.WriteLine($"  DocDefaults Before: {docDefaults.Before?.Value ?? "null"}");
-            _output.WriteLine($"  DocDefaults After: {docDefaults.After?.Value ?? "null"}");
-        }
-        else
-        {
-            _output.WriteLine("  No DocDefaults SpacingBetweenLines");
-        }
-
-        _output.WriteLine("\n=== Paragraph Styles ===");
-        foreach (var style in styles.Elements<Style>().Where(s => s.Type?.Value == StyleValues.Paragraph))
-        {
-            var spacing = style.StyleParagraphProperties?.SpacingBetweenLines;
-            _output.WriteLine($"\nStyle: {style.StyleId?.Value} (Default: {style.Default?.Value})");
-            _output.WriteLine($"  BasedOn: {style.BasedOn?.Val?.Value ?? "none"}");
-            if (spacing != null)
-            {
-                _output.WriteLine($"  Line: {spacing.Line?.Value ?? "null"}");
-                _output.WriteLine($"  LineRule: {spacing.LineRule?.Value.ToString() ?? "null"}");
-                _output.WriteLine($"  Before: {spacing.Before?.Value ?? "null"}");
-                _output.WriteLine($"  After: {spacing.After?.Value ?? "null"}");
-            }
-            else
-            {
-                _output.WriteLine("  No SpacingBetweenLines in this style");
-            }
-        }
-    }
-}
diff --git a/backend.Tests/Fixtures/Fonts/fonts - Copy.zip b/backend.Tests/Fixtures/Fonts/fonts - Copy.zip
deleted file mode 100644
index b53d9ca..0000000
Binary files a/backend.Tests/Fixtures/Fonts/fonts - Copy.zip and /dev/null differ
diff --git a/backend.Tests/Fixtures/Fonts/fonts.docx b/backend.Tests/Fixtures/Fonts/fonts.docx
deleted file mode 100644
index c1f636b..0000000
Binary files a/backend.Tests/Fixtures/Fonts/fonts.docx and /dev/null differ
diff --git a/backend.Tests/Fixtures/test.docx b/backend.Tests/Fixtures/test.docx
deleted file mode 100644
index 25bebdf..0000000
Binary files a/backend.Tests/Fixtures/test.docx and /dev/null differ
diff --git a/backend.Tests/Rules/FigureCaptionRulesTests.cs b/backend.Tests/Rules/FigureCaptionRulesTests.cs
deleted file mode 100644
index 46db953..0000000
--- a/backend.Tests/Rules/FigureCaptionRulesTests.cs
+++ /dev/null
@@ -1,462 +0,0 @@
-using backend.Models;
-using backend.Rules;
-using backend.Tests.Helpers;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using A = DocumentFormat.OpenXml.Drawing;
-using C = DocumentFormat.OpenXml.Drawing.Charts;
-using DW = DocumentFormat.OpenXml.Drawing.Wordprocessing;
-using PIC = DocumentFormat.OpenXml.Drawing.Pictures;
-
-namespace backend.Tests.Rules;
-
-public class FigureCaptionRulesTests
-{
-    private const string CaptionStyleId = "CustomLegend";
-
-    private readonly MissingFigureCaptionRule _missingRule = new();
-    private readonly FigureCaptionPositionRule _positionRule = new();
-    private readonly FigureCaptionStyleRule _styleRule = new();
-    private readonly FigureCaptionFormatRule _formatRule = new();
-    private readonly FigureCaptionAutomaticNumberingRule _numberingRule = new();
-
-    private static UniversityConfig CreateConfig() => new();
-
-    [Fact]
-    public void ImageWithCorrectAutomaticCaptionBelow_ReturnsNoFigureCaptionResults()
-    {
-        using var docx = CreateDocx(
-            CreatePictureParagraph(),
-            CreateAutomaticCaption("Rys. ", "1", " Schemat architektury systemu"));
-
-        Assert.Empty(_missingRule.Validate(docx.Document, CreateConfig()));
-        Assert.Empty(_positionRule.Validate(docx.Document, CreateConfig()));
-        Assert.Empty(_styleRule.Validate(docx.Document, CreateConfig()));
-        Assert.Empty(_formatRule.Validate(docx.Document, CreateConfig()));
-        Assert.Empty(_numberingRule.Validate(docx.Document, CreateConfig()));
-    }
-
-    [Fact]
-    public void ImageInsideTableWithoutCaption_ReturnsMissingCaptionError()
-    {
-        using var docx = CreateDocx(
-            CreateSingleCellTable(
-                CreatePictureParagraph()));
-        var config = CreateConfig();
-
-        var missing = _missingRule.Validate(docx.Document, config).ToList();
-
-        Assert.Single(missing);
-        Assert.Equal("MissingFigureCaptionRule", missing[0].RuleName);
-    }
-
-    [Fact]
-    public void ImageInsideTableWithNormalTextCaptionBelow_ReturnsMissingAndStyleError()
-    {
-        using var docx = CreateDocx(
-            CreateSingleCellTable(
-                CreatePictureParagraph(),
-                CreateCaptionParagraph("Rys. 1 Schemat architektury systemu", styleId: "Normal")));
-        var config = CreateConfig();
-
-        var missing = _missingRule.Validate(docx.Document, config).ToList();
-
-        Assert.Single(missing);
-        Assert.Equal("MissingFigureCaptionRule", missing[0].RuleName);
-        Assert.Empty(_positionRule.Validate(docx.Document, config));
-        Assert.Empty(_formatRule.Validate(docx.Document, config));
-        Assert.Empty(_numberingRule.Validate(docx.Document, config));
-
-        var styleErrors = _styleRule.Validate(docx.Document, config).ToList();
-
-        Assert.NotEmpty(styleErrors);
-        Assert.All(styleErrors, error => Assert.Equal("FigureCaptionStyleRule", error.RuleName));
-    }
-
-    [Fact]
-    public void ImageInsideTableWithAutomaticCaptionBelow_DoesNotFailFormatRule()
-    {
-        using var docx = CreateDocx(
-            CreateSingleCellTable(
-                CreatePictureParagraph(),
-                CreateAutomaticCaption("Rysunek ", "1", " Schemat architektury systemu")));
-        var config = CreateConfig();
-
-        Assert.Empty(_missingRule.Validate(docx.Document, config));
-        Assert.Empty(_positionRule.Validate(docx.Document, config));
-        Assert.Empty(_formatRule.Validate(docx.Document, config));
-    }
-
-    [Fact]
-    public void ImageWithAutomaticToolbarCaptionWithoutDescription_DoesNotFailFormatRule()
-    {
-        using var docx = CreateDocx(
-            CreatePictureParagraph(),
-            CreateAutomaticCaption("Rysunek ", "1", string.Empty));
-        var config = CreateConfig();
-
-        Assert.Empty(_missingRule.Validate(docx.Document, config));
-        Assert.Empty(_formatRule.Validate(docx.Document, config));
-    }
-
-    [Fact]
-    public void ImageWithoutCaption_ReturnsOnlyMissingCaptionError()
-    {
-        using var docx = CreateDocx(CreatePictureParagraph());
-        var config = CreateConfig();
-
-        var missing = _missingRule.Validate(docx.Document, config).ToList();
-
-        Assert.Single(missing);
-        Assert.Equal("MissingFigureCaptionRule", missing[0].RuleName);
-        Assert.Equal(ValidationSeverity.Error, missing[0].Severity);
-        Assert.Empty(_positionRule.Validate(docx.Document, config));
-        Assert.Empty(_styleRule.Validate(docx.Document, config));
-        Assert.Empty(_formatRule.Validate(docx.Document, config));
-        Assert.Empty(_numberingRule.Validate(docx.Document, config));
-    }
-
-    [Fact]
-    public void ImageWithEmptyCaptionStyledParagraph_ReturnsOnlyMissingCaptionError()
-    {
-        using var docx = CreateDocx(
-            CreatePictureParagraph(),
-            CreateCaptionParagraph("   "));
-        var config = CreateConfig();
-
-        var missing = _missingRule.Validate(docx.Document, config).ToList();
-
-        Assert.Single(missing);
-        Assert.Equal("MissingFigureCaptionRule", missing[0].RuleName);
-        Assert.Empty(_positionRule.Validate(docx.Document, config));
-        Assert.Empty(_styleRule.Validate(docx.Document, config));
-        Assert.Empty(_formatRule.Validate(docx.Document, config));
-        Assert.Empty(_numberingRule.Validate(docx.Document, config));
-    }
-
-    [Fact]
-    public void ImageWithManuallyTypedValidCaption_WarnsAboutManualNumberingOnly()
-    {
-        using var docx = CreateDocx(
-            CreatePictureParagraph(),
-            CreateCaptionParagraph("Rys. 1 Schemat architektury systemu"));
-        var config = CreateConfig();
-
-        Assert.Empty(_missingRule.Validate(docx.Document, config));
-        Assert.Empty(_formatRule.Validate(docx.Document, config));
-
-        var warnings = _numberingRule.Validate(docx.Document, config).ToList();
-
-        Assert.Single(warnings);
-        Assert.Equal("FigureCaptionAutomaticNumberingRule", warnings[0].RuleName);
-        Assert.Equal(ValidationSeverity.Warning, warnings[0].Severity);
-    }
-
-    [Theory]
-    [InlineData("Rys 1 Schemat architektury systemu")]
-    [InlineData("Rysunek 1 Schemat architektury systemu")]
-    public void ImageWithManuallyTypedValidCaptionUsingSupportedLabels_WarnsAboutManualNumberingOnly(
-        string captionText)
-    {
-        using var docx = CreateDocx(
-            CreatePictureParagraph(),
-            CreateCaptionParagraph(captionText));
-        var config = CreateConfig();
-
-        Assert.Empty(_missingRule.Validate(docx.Document, config));
-        Assert.Empty(_formatRule.Validate(docx.Document, config));
-
-        var warnings = _numberingRule.Validate(docx.Document, config).ToList();
-
-        Assert.Single(warnings);
-        Assert.Equal("FigureCaptionAutomaticNumberingRule", warnings[0].RuleName);
-        Assert.Equal(ValidationSeverity.Warning, warnings[0].Severity);
-    }
-
-    [Fact]
-    public void CaptionAboveImage_ReturnsPositionErrorWithoutMissingCaptionError()
-    {
-        using var docx = CreateDocx(
-            CreateAutomaticCaption("Rys. ", "1", " Schemat architektury systemu"),
-            CreatePictureParagraph());
-        var config = CreateConfig();
-
-        Assert.Empty(_missingRule.Validate(docx.Document, config));
-
-        var errors = _positionRule.Validate(docx.Document, config).ToList();
-
-        Assert.Single(errors);
-        Assert.Equal("FigureCaptionPositionRule", errors[0].RuleName);
-        Assert.Equal(ValidationSeverity.Error, errors[0].Severity);
-        Assert.Contains("below", errors[0].Message, StringComparison.OrdinalIgnoreCase);
-    }
-
-    [Fact]
-    public void FigureBeforeAnotherFigure_DoesNotTreatLaterCaptionAsSeparatedCaption()
-    {
-        using var docx = CreateDocx(
-            CreatePictureParagraph(),
-            CreatePictureParagraph(),
-            CreateCaptionParagraph("Rys. 2 Schemat architektury systemu"));
-        var config = CreateConfig();
-
-        var missing = _missingRule.Validate(docx.Document, config).ToList();
-        var position = _positionRule.Validate(docx.Document, config).ToList();
-
-        Assert.Single(missing);
-        Assert.Equal("MissingFigureCaptionRule", missing[0].RuleName);
-        Assert.Empty(position);
-    }
-
-    [Fact]
-    public void ZeroWidthSpacingBetweenFigureAndCaption_DoesNotTriggerPositionError()
-    {
-        using var docx = CreateDocx(
-            CreatePictureParagraph(),
-            CreateCaptionParagraph("\u200B"),
-            CreateCaptionParagraph("Rys. 1 Schemat architektury systemu"));
-        var config = CreateConfig();
-
-        Assert.Empty(_missingRule.Validate(docx.Document, config));
-        Assert.Empty(_positionRule.Validate(docx.Document, config));
-    }
-
-    [Fact]
-    public void CaptionWithWrongLabel_ReturnsFormatErrorWithoutMissingCaptionError()
-    {
-        using var docx = CreateDocx(
-            CreatePictureParagraph(),
-            CreateCaptionParagraph("Obrazek 1 Schemat architektury systemu"));
-        var config = CreateConfig();
-
-        Assert.Empty(_missingRule.Validate(docx.Document, config));
-
-        var errors = _formatRule.Validate(docx.Document, config).ToList();
-
-        Assert.Single(errors);
-        Assert.Equal("FigureCaptionFormatRule", errors[0].RuleName);
-        Assert.Equal(ValidationSeverity.Error, errors[0].Severity);
-    }
-
-    [Fact]
-    public void CaptionWithWrongStyle_ReturnsStyleError()
-    {
-        using var docx = CreateDocx(
-            CreatePictureParagraph(),
-            CreateCaptionParagraph(
-                "Rys. 1 Schemat architektury systemu",
-                styleId: "Normal",
-                includeDirectCaptionFormatting: true));
-
-        var errors = _styleRule.Validate(docx.Document, CreateConfig()).ToList();
-
-        Assert.Single(errors);
-        Assert.Equal("FigureCaptionStyleRule", errors[0].RuleName);
-        Assert.Equal(ValidationSeverity.Error, errors[0].Severity);
-        Assert.Contains("Caption style", errors[0].Message);
-    }
-
-    [Fact]
-    public void TextBoxOnlyDrawing_DoesNotRequireFigureCaption()
-    {
-        using var docx = CreateDocx(CreateTextBoxOnlyParagraph());
-
-        var errors = _missingRule.Validate(docx.Document, CreateConfig()).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void ChartDrawing_IsTreatedAsFigureCandidate()
-    {
-        using var docx = CreateDocx(CreateChartParagraph());
-
-        var errors = _missingRule.Validate(docx.Document, CreateConfig()).ToList();
-
-        Assert.Single(errors);
-        Assert.Equal("MissingFigureCaptionRule", errors[0].RuleName);
-    }
-
-    [Theory]
-    [InlineData("Rys. 1 Schemat architektury systemu")]
-    [InlineData("Rys. 1")]
-    [InlineData("Rys 1 Schemat architektury systemu")]
-    [InlineData("Rys 1")]
-    [InlineData("Rys. 1: Schemat architektury systemu")]
-    [InlineData("Rysunek 1 Schemat architektury systemu")]
-    [InlineData("Rysunek 1")]
-    [InlineData("Rys. 2.1 Diagram klas")]
-    [InlineData("Rys. 2.1")]
-    public void AcceptedVisibleCaptionFormats_PassFormatRule(string captionText)
-    {
-        using var docx = CreateDocx(
-            CreatePictureParagraph(),
-            CreateCaptionParagraph(captionText));
-
-        var errors = _formatRule.Validate(docx.Document, CreateConfig()).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Theory]
-    [InlineData("Diagram 1 Schemat architektury systemu")]
-    [InlineData("Rysunek: 1 Schemat architektury systemu")]
-    public void InvalidVisibleCaptionFormats_FailFormatRule(string captionText)
-    {
-        using var docx = CreateDocx(
-            CreatePictureParagraph(),
-            CreateCaptionParagraph(captionText));
-
-        var errors = _formatRule.Validate(docx.Document, CreateConfig()).ToList();
-
-        Assert.Single(errors);
-        Assert.Equal("FigureCaptionFormatRule", errors[0].RuleName);
-    }
-
-    private static InMemoryDocx CreateDocx(params OpenXmlElement[] bodyChildren)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-        AddStyles(mainPart);
-
-        foreach (var child in bodyChildren)
-        {
-            mainPart.Document.Body!.Append(child);
-        }
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-    private static void AddStyles(MainDocumentPart mainPart)
-    {
-        var stylesPart = mainPart.AddNewPart<StyleDefinitionsPart>();
-        stylesPart.Styles = new Styles(
-            new Style(
-                new StyleName { Val = "Normal" })
-            {
-                Type = StyleValues.Paragraph,
-                Default = true,
-                StyleId = "Normal"
-            },
-            new Style(
-                new StyleName { Val = "Legenda" },
-                new StyleParagraphProperties(
-                    new Justification { Val = JustificationValues.Center },
-                    new Indentation { Left = "0", FirstLine = "0" }),
-                new StyleRunProperties(
-                    new FontSize { Val = "22" }))
-            {
-                Type = StyleValues.Paragraph,
-                StyleId = CaptionStyleId
-            });
-    }
-
-    private static Paragraph CreatePictureParagraph()
-    {
-        return new Paragraph(new Run(CreatePictureDrawing()));
-    }
-
-    private static Table CreateSingleCellTable(params OpenXmlElement[] cellContent)
-    {
-        var cell = new TableCell();
-        foreach (var element in cellContent)
-        {
-            cell.Append(element.CloneNode(true));
-        }
-
-        return new Table(
-            new TableProperties(
-                new TableBorders(
-                    new TopBorder { Val = BorderValues.Nil },
-                    new BottomBorder { Val = BorderValues.Nil },
-                    new LeftBorder { Val = BorderValues.Nil },
-                    new RightBorder { Val = BorderValues.Nil },
-                    new InsideHorizontalBorder { Val = BorderValues.Nil },
-                    new InsideVerticalBorder { Val = BorderValues.Nil })),
-            new TableRow(cell));
-    }
-
-    private static Paragraph CreateChartParagraph()
-    {
-        return new Paragraph(new Run(new Drawing(
-            new DW.Inline(
-                new A.Graphic(
-                    new A.GraphicData(new C.ChartReference { Id = "rIdChart1" })
-                    {
-                        Uri = "http://schemas.openxmlformats.org/drawingml/2006/chart"
-                    })))));
-    }
-
-    private static Paragraph CreateTextBoxOnlyParagraph()
-    {
-        return new Paragraph(new Run(new Drawing(
-            new DW.Inline(
-                new A.Graphic(
-                    new A.GraphicData(
-                        new A.TextBody(
-                            new A.BodyProperties(),
-                            new A.ListStyle(),
-                            new A.Paragraph(
-                                new A.Run(new A.Text("Only text")))))
-                    {
-                        Uri = "http://schemas.microsoft.com/office/word/2010/wordprocessingShape"
-                    })))));
-    }
-
-    private static Drawing CreatePictureDrawing()
-    {
-        return new Drawing(
-            new DW.Inline(
-                new A.Graphic(
-                    new A.GraphicData(
-                        new PIC.Picture())
-                    {
-                        Uri = "http://schemas.openxmlformats.org/drawingml/2006/picture"
-                    })));
-    }
-
-    private static Paragraph CreateAutomaticCaption(
-        string label,
-        string number,
-        string description)
-    {
-        return new Paragraph(
-            new ParagraphProperties(new ParagraphStyleId { Val = CaptionStyleId }),
-            new Run(new Text(label) { Space = SpaceProcessingModeValues.Preserve }),
-            new SimpleField(
-                new Run(new Text(number)))
-            {
-                Instruction = "SEQ Rys \\* ARABIC"
-            },
-            new Run(new Text(description) { Space = SpaceProcessingModeValues.Preserve }));
-    }
-
-    private static Paragraph CreateCaptionParagraph(
-        string text,
-        string styleId = CaptionStyleId,
-        bool includeDirectCaptionFormatting = false)
-    {
-        var paragraphProperties = new ParagraphProperties(new ParagraphStyleId { Val = styleId });
-        var runProperties = new RunProperties();
-
-        if (includeDirectCaptionFormatting)
-        {
-            paragraphProperties.Append(
-                new Justification { Val = JustificationValues.Center },
-                new Indentation { Left = "0", FirstLine = "0" });
-            runProperties.Append(new FontSize { Val = "22" });
-        }
-
-        return new Paragraph(
-            paragraphProperties,
-            new Run(
-                runProperties,
-                new Text(text) { Space = SpaceProcessingModeValues.Preserve }));
-    }
-}
diff --git a/backend.Tests/Rules/FontFamilyRuleTests.cs b/backend.Tests/Rules/FontFamilyRuleTests.cs
deleted file mode 100644
index d956da0..0000000
--- a/backend.Tests/Rules/FontFamilyRuleTests.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-using backend.Models;
-using backend.Rules;
-using backend.Tests.Helpers;
-using Backend.Models;
-
-namespace backend.Tests.Rules;
-
-public class FontFamilyRuleTests
-{
-    private readonly FontFamilyValidationRule _rule = new();
-
-    private static UniversityConfig CreateConfig(string fontFamily = "Times New Roman")
-    {
-        return new UniversityConfig
-        {
-            Formatting = new FormattingConfig
-            {
-                Font = new FontConfig { FontFamily = fontFamily }
-            }
-        };
-    }
-
-    [Fact]
-    public void Validate_AllParagraphsWithCorrectFont_ReturnsNoErrors()
-    {
-        // Arrange
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("First paragraph", "Times New Roman"),
-            ("Second paragraph", "Times New Roman")
-        );
-        var config = CreateConfig("Times New Roman");
-
-        // Act
-        var errors = _rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void Validate_ParagraphWithWrongFont_ReturnsError()
-    {
-        // Arrange
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("Correct font paragraph", "Times New Roman"),
-            ("Wrong font paragraph", "Arial")
-        );
-        var config = CreateConfig("Times New Roman");
-
-        // Act
-        var errors = _rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Single(errors);
-        Assert.Contains("Arial", errors[0].Message);
-        Assert.Contains("Times New Roman", errors[0].Message);
-        Assert.True(errors[0].IsError);
-    }
-
-    [Fact]
-    public void Validate_MultipleParagraphsWithWrongFonts_ReturnsMultipleErrors()
-    {
-        // Arrange
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("Arial paragraph", "Arial"),
-            ("Calibri paragraph", "Calibri"),
-            ("Correct paragraph", "Times New Roman")
-        );
-        var config = CreateConfig("Times New Roman");
-
-        // Act
-        var errors = _rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Equal(2, errors.Count);
-        Assert.Contains(errors, e => e.Message.Contains("Arial"));
-        Assert.Contains(errors, e => e.Message.Contains("Calibri"));
-    }
-
-    [Fact]
-    public void Validate_WithDefaultFontStyle_UsesDefaultFont()
-    {
-        // Arrange
-        using var docx = DocxTestHelper.CreateInMemoryDocxWithDefaultFont(
-            "Times New Roman",
-            "Paragraph without explicit font"
-        );
-        var config = CreateConfig("Times New Roman");
-
-        // Act
-        var errors = _rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void Validate_ConfigWithDifferentExpectedFont_ValidatesAgainstConfigFont()
-    {
-        // Arrange
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("Arial paragraph", "Arial")
-        );
-        var config = CreateConfig("Arial"); // Expecting Arial
-
-        // Act
-        var errors = _rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Empty(errors); // Arial is now the expected font
-    }
-
-    [Fact]
-    public void Validate_CodeBlockParagraph_IsSkipped()
-    {
-        // Arrange
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("public void ValidateDocument() { return; }", "Consolas")
-        );
-        var config = CreateConfig("Times New Roman");
-
-        // Act
-        var errors = _rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void Validate_EmptyParagraph_IsSkipped()
-    {
-        // Arrange
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("", "Arial"),
-            ("   ", "Calibri"),
-            ("Valid text", "Times New Roman")
-        );
-        var config = CreateConfig("Times New Roman");
-
-        // Act
-        var errors = _rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Empty(errors); // Empty/whitespace paragraphs should be skipped
-    }
-
-    [Fact]
-    public void Validate_ErrorContainsCorrectLocation()
-    {
-        // Arrange
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("First paragraph", "Times New Roman"),
-            ("Second paragraph with wrong font", "Arial")
-        );
-        var config = CreateConfig("Times New Roman");
-
-        // Act
-        var errors = _rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Single(errors);
-        Assert.Equal(2, errors[0].Location.Paragraph);
-        Assert.Equal(1, errors[0].Location.Run);
-        Assert.Equal(0, errors[0].Location.CharacterOffset);
-        Assert.Equal("Second paragraph with wrong font".Length, errors[0].Location.Length);
-        Assert.Equal("Second paragraph with wrong font", errors[0].Location.Text);
-        Assert.True(errors[0].Location.PageNumber >= 1);
-        Assert.True(errors[0].Location.LineNumber >= 1);
-    }
-
-    [Fact]
-    public void Validate_LocationTracksCharacterOffset()
-    {
-        // Arrange - Create doc with multiple runs in same paragraph
-        using var docx = DocxTestHelper.CreateInMemoryDocxWithMultipleRuns(
-            ("First run ", "Times New Roman"),
-            ("Second run with wrong font", "Arial")
-        );
-        var config = CreateConfig("Times New Roman");
-
-        // Act
-        var errors = _rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Single(errors);
-        Assert.Equal(1, errors[0].Location.Paragraph);
-        Assert.Equal(2, errors[0].Location.Run);
-        Assert.Equal("First run ".Length, errors[0].Location.CharacterOffset);
-    }
-
-    [Fact]
-    public void Validate_LocationIncludesPageAndLine()
-    {
-        // Arrange
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("Wrong font paragraph", "Arial")
-        );
-        var config = CreateConfig("Times New Roman");
-
-        // Act
-        var errors = _rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Single(errors);
-        Assert.Equal(1, errors[0].Location.PageNumber);
-        Assert.Equal(1, errors[0].Location.LineNumber);
-        Assert.Contains("Page 1", errors[0].Location.Description);
-        Assert.Contains("Line 1", errors[0].Location.Description);
-    }
-
-    [Fact]
-    public void Validate_RuleNameIsCorrect()
-    {
-        // Assert
-        Assert.Equal("FontFamily", _rule.Name);
-    }
-}
diff --git a/backend.Tests/Rules/GrammarRuleTests.cs b/backend.Tests/Rules/GrammarRuleTests.cs
deleted file mode 100644
index dd64374..0000000
--- a/backend.Tests/Rules/GrammarRuleTests.cs
+++ /dev/null
@@ -1,291 +0,0 @@
-using backend.Models;
-using backend.Rules;
-using backend.Services.CodeBlocks;
-using backend.Tests.Helpers;
-using Backend.Models;
-using Microsoft.Extensions.Configuration;
-using Moq;
-using Moq.Protected;
-using System.Net;
-using System.Text.Json;
-using backend.Services.Language;
-
-namespace backend.Tests.Rules;
-
-public class GrammarRuleTests
-{
-    private static UniversityConfig CreateConfig(string language = "en-US")
-    {
-        return new UniversityConfig
-        {
-            Language = language
-        };
-    }
-
-    private static LanguageToolService CreateMockLanguageToolService(
-        LanguageToolResponse? response = null,
-        bool isAvailable = true)
-    {
-        return CreateMockLanguageToolServiceWithHandler(response, isAvailable).Service;
-    }
-
-    private static (LanguageToolService Service, Mock<HttpMessageHandler> HandlerMock) CreateMockLanguageToolServiceWithHandler(
-        LanguageToolResponse? response = null,
-        bool isAvailable = true)
-    {
-        var handlerMock = new Mock<HttpMessageHandler>();
-
-        // Mock languages endpoint (availability check)
-        handlerMock
-            .Protected()
-            .Setup<Task<HttpResponseMessage>>(
-                "SendAsync",
-                ItExpr.Is<HttpRequestMessage>(r => r.RequestUri!.PathAndQuery.Contains("/v2/languages")),
-                ItExpr.IsAny<CancellationToken>())
-            .ReturnsAsync(new HttpResponseMessage
-            {
-                StatusCode = isAvailable ? HttpStatusCode.OK : HttpStatusCode.ServiceUnavailable,
-                Content = new StringContent("[]")
-            });
-
-        // Mock check endpoint
-        var checkResponse = response ?? new LanguageToolResponse { Matches = new List<LanguageToolMatch>() };
-        handlerMock
-            .Protected()
-            .Setup<Task<HttpResponseMessage>>(
-                "SendAsync",
-                ItExpr.Is<HttpRequestMessage>(r => r.RequestUri!.PathAndQuery.Contains("/v2/check")),
-                ItExpr.IsAny<CancellationToken>())
-            .ReturnsAsync(new HttpResponseMessage
-            {
-                StatusCode = HttpStatusCode.OK,
-                Content = new StringContent(JsonSerializer.Serialize(checkResponse))
-            });
-
-        var httpClient = new HttpClient(handlerMock.Object);
-        var configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(new Dictionary<string, string?>
-            {
-                ["LanguageTool:BaseUrl"] = "http://localhost:8010"
-            })
-            .Build();
-
-        return (new LanguageToolService(httpClient, configuration), handlerMock);
-    }
-
-    [Fact]
-    public void Validate_NoGrammarErrors_ReturnsEmpty()
-    {
-        // Arrange
-        var service = CreateMockLanguageToolService(new LanguageToolResponse
-        {
-            Matches = new List<LanguageToolMatch>()
-        });
-        var rule = new GrammarRule(service);
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("This sentence is correct.", "Times New Roman")
-        );
-        var config = CreateConfig();
-
-        // Act
-        var errors = rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void Validate_CodeBlockParagraph_DoesNotSendTextToLanguageTool()
-    {
-        // Arrange
-        var (service, handlerMock) = CreateMockLanguageToolServiceWithHandler();
-        var rule = new GrammarRule(service, CodeBlockDetector.CreateDefault());
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("public async Task<IActionResult> ValidateDocument() { return Ok(); }", "Consolas")
-        );
-        var config = CreateConfig();
-
-        // Act
-        var errors = rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Empty(errors);
-        handlerMock.Protected().Verify<Task<HttpResponseMessage>>(
-            "SendAsync",
-            Times.Never(),
-            ItExpr.Is<HttpRequestMessage>(r => r.RequestUri!.PathAndQuery.Contains("/v2/check")),
-            ItExpr.IsAny<CancellationToken>());
-    }
-
-    [Fact]
-    public void Validate_NormalProseParagraph_SendsTextToLanguageTool()
-    {
-        // Arrange
-        var (service, handlerMock) = CreateMockLanguageToolServiceWithHandler();
-        var rule = new GrammarRule(service, CodeBlockDetector.CreateDefault());
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("This sentence is correct.", "Times New Roman")
-        );
-        var config = CreateConfig();
-
-        // Act
-        var errors = rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Empty(errors);
-        handlerMock.Protected().Verify<Task<HttpResponseMessage>>(
-            "SendAsync",
-            Times.Once(),
-            ItExpr.Is<HttpRequestMessage>(r => r.RequestUri!.PathAndQuery.Contains("/v2/check")),
-            ItExpr.IsAny<CancellationToken>());
-    }
-
-    [Fact]
-    public void Validate_WithSpellingError_ReturnsError()
-    {
-        // Arrange
-        var service = CreateMockLanguageToolService(new LanguageToolResponse
-        {
-            Matches = new List<LanguageToolMatch>
-            {
-                new LanguageToolMatch
-                {
-                    Message = "Possible spelling mistake found",
-                    Offset = 5,
-                    Length = 5,
-                    Sentence = "This speling is wrong.",
-                    Replacements = new List<LanguageToolReplacement>
-                    {
-                        new() { Value = "spelling" }
-                    },
-                    Rule = new LanguageToolRule
-                    {
-                        Id = "MORFOLOGIK_RULE_EN_US",
-                        IssueType = "misspelling",
-                        Category = new LanguageToolCategory { Id = "TYPOS", Name = "Possible Typo" }
-                    }
-                }
-            }
-        });
-        var rule = new GrammarRule(service);
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("This speling is wrong.", "Times New Roman")
-        );
-        var config = CreateConfig();
-
-        // Act
-        var errors = rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Single(errors);
-        Assert.Contains("Spelling", errors[0].Message);
-        Assert.Contains("spelling", errors[0].Message); // suggestion
-        Assert.True(errors[0].IsError);
-    }
-
-    [Fact]
-    public void Validate_WithGrammarError_ReturnsError()
-    {
-        // Arrange
-        var service = CreateMockLanguageToolService(new LanguageToolResponse
-        {
-            Matches = new List<LanguageToolMatch>
-            {
-                new LanguageToolMatch
-                {
-                    Message = "The verb 'are' does not agree with the subject 'He'",
-                    Offset = 3,
-                    Length = 3,
-                    Sentence = "He are going home.",
-                    Replacements = new List<LanguageToolReplacement>
-                    {
-                        new() { Value = "is" }
-                    },
-                    Rule = new LanguageToolRule
-                    {
-                        Id = "SUBJECT_VERB_AGREEMENT",
-                        IssueType = "grammar",
-                        Category = new LanguageToolCategory { Id = "GRAMMAR", Name = "Grammar" }
-                    }
-                }
-            }
-        });
-        var rule = new GrammarRule(service);
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("He are going home.", "Times New Roman")
-        );
-        var config = CreateConfig();
-
-        // Act
-        var errors = rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Single(errors);
-        Assert.Contains("Grammar", errors[0].Message);
-        Assert.True(errors[0].IsError);
-    }
-
-    [Fact]
-    public void Validate_ServiceUnavailable_ReturnsWarning()
-    {
-        // Arrange
-        var service = CreateMockLanguageToolService(isAvailable: false);
-        var rule = new GrammarRule(service);
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("Some text here.", "Times New Roman")
-        );
-        var config = CreateConfig();
-
-        // Act
-        var errors = rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Single(errors);
-        Assert.Contains("not available", errors[0].Message);
-        Assert.False(errors[0].IsError); // Warning, not error
-    }
-
-    [Fact]
-    public void Validate_RuleNameIsCorrect()
-    {
-        // Arrange
-        var service = CreateMockLanguageToolService();
-        var rule = new GrammarRule(service);
-
-        // Assert
-        Assert.Equal("Grammar", rule.Name);
-    }
-
-    [Fact]
-    public void Validate_LocationIncludesPageAndLine()
-    {
-        // Arrange
-        var service = CreateMockLanguageToolService(new LanguageToolResponse
-        {
-            Matches = new List<LanguageToolMatch>
-            {
-                new LanguageToolMatch
-                {
-                    Message = "Spelling mistake",
-                    Offset = 0,
-                    Length = 4,
-                    Rule = new LanguageToolRule { IssueType = "misspelling" }
-                }
-            }
-        });
-        var rule = new GrammarRule(service);
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("Tset text.", "Times New Roman")
-        );
-        var config = CreateConfig();
-
-        // Act
-        var errors = rule.Validate(docx.Document, config).ToList();
-
-        // Assert
-        Assert.Single(errors);
-        Assert.Equal(1, errors[0].Location.PageNumber);
-        Assert.True(errors[0].Location.LineNumber >= 1);
-        Assert.Equal(1, errors[0].Location.Paragraph);
-    }
-}
diff --git a/backend.Tests/Rules/LineSpacingDependencyRuleTests.cs b/backend.Tests/Rules/LineSpacingDependencyRuleTests.cs
deleted file mode 100644
index 64582b2..0000000
--- a/backend.Tests/Rules/LineSpacingDependencyRuleTests.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using backend.Tests.Helpers;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using Rules;
-
-namespace backend.Tests.Rules;
-
-public class LineSpacingDependencyRuleTests
-{
-    private readonly LineSpacingDependencyRule _rule = new();
-
-    private static UniversityConfig CreateConfig() => new();
-
-    private static InMemoryDocx CreateDocxWithLineSpacing(
-        int lineValue,
-        LineSpacingRuleValues? lineRule,
-        int? beforeTwips,
-        int? afterTwips,
-        string? styleId = null)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        var spacing = new SpacingBetweenLines { Line = lineValue.ToString() };
-
-        if (lineRule.HasValue)
-            spacing.LineRule = lineRule.Value;
-
-        if (beforeTwips.HasValue)
-            spacing.Before = beforeTwips.Value.ToString();
-
-        if (afterTwips.HasValue)
-            spacing.After = afterTwips.Value.ToString();
-
-        var paragraphProperties = new ParagraphProperties(spacing);
-        if (!string.IsNullOrEmpty(styleId))
-        {
-            paragraphProperties.ParagraphStyleId = new ParagraphStyleId { Val = styleId };
-        }
-
-        var paragraph = new Paragraph(
-            paragraphProperties,
-            new Run(new Text("Test paragraph")));
-
-        mainPart.Document.Body!.Append(paragraph);
-        mainPart.Document.Save();
-
-        return new InMemoryDocx(doc, stream);
-    }
-
-    [Fact]
-    public void LineSpacing15_WithSpacingAfter_ReturnsError()
-    {
-        using var docx = CreateDocxWithLineSpacing(360, LineSpacingRuleValues.Auto, null, 4000);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("1.5 line spacing", errors[0].Message);
-        Assert.Contains("After=200", errors[0].Message);
-    }
-
-    [Fact]
-    public void LineSpacing15_WithSpacingBefore_ReturnsError()
-    {
-        using var docx = CreateDocxWithLineSpacing(360, LineSpacingRuleValues.Auto, 120, 0);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("Before=6", errors[0].Message);
-    }
-
-    [Fact]
-    public void LineSpacing15_WithZeroSpacing_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithLineSpacing(360, LineSpacingRuleValues.Auto, 0, 0);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void LineSpacing15_WithNullSpacing_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithLineSpacing(360, LineSpacingRuleValues.Auto, null, null);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void SingleLineSpacing_WithSpacingAfter_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithLineSpacing(240, LineSpacingRuleValues.Auto, null, 120);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void DoubleLineSpacing_WithSpacingAfter_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithLineSpacing(480, LineSpacingRuleValues.Auto, null, 120);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void LineSpacing15_With6ptSpacing_ReturnsError()
-    {
-        using var docx = CreateDocxWithLineSpacing(360, LineSpacingRuleValues.Auto, null, 120);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("After=6", errors[0].Message);
-    }
-
-    [Fact]
-    public void ExcludedStylePattern_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithLineSpacing(360, LineSpacingRuleValues.Auto, null, 120, "Caption");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void HelloDocx_ListStyleParagraphsAreExcluded()
-    {
-        using var doc = WordprocessingDocument.Open(
-            @"C:\Users\envv\Documents\GitHub\thesis-validator\backend.Tests\Fixtures\hello.docx", false);
-
-        var errors = _rule.Validate(doc, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-}
diff --git a/backend.Tests/Rules/ListConsistencyRuleTests.cs b/backend.Tests/Rules/ListConsistencyRuleTests.cs
deleted file mode 100644
index b87b27c..0000000
--- a/backend.Tests/Rules/ListConsistencyRuleTests.cs
+++ /dev/null
@@ -1,358 +0,0 @@
-using backend.Tests.Helpers;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using Rules;
-
-namespace backend.Tests.Rules;
-
-public class ListConsistencyRuleTests
-{
-    private readonly ListConsistencyRule _rule = new();
-
-    private static UniversityConfig CreateConfig() => new();
-
-    private static Paragraph CreateListItem(
-        string text,
-        int numberingId,
-        int level = 0,
-        int? indentTwips = null,
-        string? styleId = null)
-    {
-        var numberingProps = new NumberingProperties(
-            new NumberingLevelReference { Val = level },
-            new NumberingId { Val = numberingId }
-        );
-
-        var paraProps = new ParagraphProperties(numberingProps);
-        if (!string.IsNullOrEmpty(styleId))
-        {
-            paraProps.ParagraphStyleId = new ParagraphStyleId { Val = styleId };
-        }
-
-        if (indentTwips.HasValue)
-        {
-            paraProps.Indentation = new Indentation { Left = indentTwips.Value.ToString() };
-        }
-
-        return new Paragraph(
-            paraProps,
-            new Run(new Text(text))
-        );
-    }
-
-    private static Paragraph CreateNumberedHeading(string text, int numberingId, int level = 0)
-    {
-        return new Paragraph(
-            new ParagraphProperties(
-                new ParagraphStyleId { Val = "Heading1" },
-                new NumberingProperties(
-                    new NumberingLevelReference { Val = level },
-                    new NumberingId { Val = numberingId })),
-            new Run(new Text(text)));
-    }
-
-    private static InMemoryDocx CreateDocxWithParagraphs(params Paragraph[] paragraphs)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        foreach (var para in paragraphs)
-        {
-            mainPart.Document.Body!.Append(para);
-        }
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-    [Fact]
-    public void ConsistentPunctuationWithSemicolons_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("First item;", 1),
-            CreateListItem("Second item;", 1),
-            CreateListItem("Third item.", 1)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void ConsistentPunctuationWithCommas_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("First item,", 1),
-            CreateListItem("Second item,", 1),
-            CreateListItem("Third item.", 1)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void MixedPunctuation_ReturnsErrors()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("First item;", 1),
-            CreateListItem("Second item,", 1),
-            CreateListItem("Third item;", 1),
-            CreateListItem("Fourth item.", 1)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("','", errors[0].Message);
-        Assert.Contains("';'", errors[0].Message);
-    }
-
-    [Fact]
-    public void LastItemNotEndingWithPeriod_ReturnsError()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("First item;", 1),
-            CreateListItem("Second item;", 1),
-            CreateListItem("Third item;", 1)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("Last list item should end with period", errors[0].Message);
-    }
-
-    [Fact]
-    public void MiddleItemMissingPunctuation_ReturnsError()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("First item;", 1),
-            CreateListItem("Second item", 1),
-            CreateListItem("Third item.", 1)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("no punctuation", errors[0].Message);
-        Assert.Contains("';'", errors[0].Message);
-    }
-
-    [Fact]
-    public void SingleItemList_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("Only item.", 1)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void FirstItemNoPunctuation_MiddleItemsMustMatch()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("First item", 1),
-            CreateListItem("Second item;", 1),
-            CreateListItem("Third item.", 1)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("';'", errors[0].Message);
-        Assert.Contains("no punctuation", errors[0].Message);
-    }
-
-    [Fact]
-    public void AllItemsNoPunctuation_LastMustEndWithPeriod()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("First item", 1),
-            CreateListItem("Second item", 1),
-            CreateListItem("Third item", 1)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("Last list item should end with period", errors[0].Message);
-    }
-
-    [Fact]
-    public void ConsistentIndentation_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("First item;", 1, level: 0, indentTwips: 720),
-            CreateListItem("Second item;", 1, level: 0, indentTwips: 720),
-            CreateListItem("Third item.", 1, level: 0, indentTwips: 720)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void InconsistentIndentation_ReturnsError()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("First item;", 1, level: 0, indentTwips: 720),
-            CreateListItem("Second item;", 1, level: 0, indentTwips: 1440),
-            CreateListItem("Third item.", 1, level: 0, indentTwips: 720)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("inconsistent indentation", errors[0].Message);
-    }
-
-    [Fact]
-    public void DifferentLevelsWithDifferentIndentation_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("First item;", 1, level: 0, indentTwips: 720),
-            CreateListItem("Sub item;", 1, level: 1, indentTwips: 1440),
-            CreateListItem("Second item.", 1, level: 0, indentTwips: 720)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        var indentErrors = errors.Where(e => e.Message.Contains("indentation")).ToList();
-        Assert.Empty(indentErrors);
-    }
-
-    [Fact]
-    public void TwoSeparateLists_CheckedIndependently()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("List1 item1;", 1),
-            CreateListItem("List1 item2.", 1),
-            new Paragraph(new Run(new Text("Normal paragraph between lists"))),
-            CreateListItem("List2 item1,", 2),
-            CreateListItem("List2 item2.", 2)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void NumberedHeadings_AreNotCheckedAsListItems()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateNumberedHeading("Chapter one", 1),
-            CreateNumberedHeading("Chapter two", 1)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void ExcludedStylePattern_AreNotCheckedAsListItems()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("Caption one;", 1, styleId: "Caption"),
-            CreateListItem("Caption two;", 1, styleId: "Caption")
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void NumberedHeading_BreaksAdjacentLists()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("First list item;", 1),
-            CreateListItem("First list end.", 1),
-            CreateNumberedHeading("Chapter heading", 1),
-            CreateListItem("Second list item;", 1),
-            CreateListItem("Second list end.", 1)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void TwoListsBothWithErrors_ReportsAllErrors()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("List1 item1;", 1),
-            CreateListItem("List1 item2;", 1),
-            new Paragraph(new Run(new Text("Normal paragraph"))),
-            CreateListItem("List2 item1,", 2),
-            CreateListItem("List2 item2,", 2)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Equal(2, errors.Count);
-    }
-
-    [Fact]
-    public void EmptyListItem_HandledGracefully()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("First item;", 1),
-            CreateListItem("", 1),
-            CreateListItem("Third item.", 1)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("no punctuation", errors[0].Message);
-        Assert.Contains("';'", errors[0].Message);
-    }
-
-    [Fact]
-    public void NoLists_ReturnsNoErrors()
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body(
-            new Paragraph(new Run(new Text("Normal paragraph 1."))),
-            new Paragraph(new Run(new Text("Normal paragraph 2.")))
-        ));
-        mainPart.Document.Save();
-        using var docx = new InMemoryDocx(doc, stream);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void NestedListLevels_CheckedSeparately()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            CreateListItem("Main item 1:", 1, level: 0),
-            CreateListItem("Sub item a;", 1, level: 1),
-            CreateListItem("Sub item b.", 1, level: 1),
-            CreateListItem("Main item 2.", 1, level: 0)
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.NotNull(errors);
-    }
-}
diff --git a/backend.Tests/Rules/NoDotsInTitlesRuleTests.cs b/backend.Tests/Rules/NoDotsInTitlesRuleTests.cs
deleted file mode 100644
index b2f8454..0000000
--- a/backend.Tests/Rules/NoDotsInTitlesRuleTests.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-using backend.Tests.Helpers;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using Rules;
-
-namespace backend.Tests.Rules;
-
-public class NoDotsInTitlesRuleTests
-{
-    private readonly NoDotsInTitlesRule _rule = new();
-
-    private static UniversityConfig CreateConfig() => new();
-
-    private static InMemoryDocx CreateDocxWithStyledParagraph(string styleId, string text)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        var paragraph = new Paragraph(
-            new ParagraphProperties(
-                new ParagraphStyleId { Val = styleId }
-            ),
-            new Run(new Text(text))
-        );
-        mainPart.Document.Body!.Append(paragraph);
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-    private static InMemoryDocx CreateDocxWithNormalParagraph(string text)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        var paragraph = new Paragraph(
-            new Run(new Text(text))
-        );
-        mainPart.Document.Body!.Append(paragraph);
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-    [Theory]
-    [InlineData("Heading1", "Introduction.")]
-    [InlineData("Heading2", "Chapter One.")]
-    [InlineData("Nagwek1", "Rozdział pierwszy.")]
-    [InlineData("Title", "My Thesis Title.")]
-    [InlineData("Tytu", "Tytuł pracy.")]
-    [InlineData("Subtitle", "A Subtitle.")]
-    [InlineData("Podtytu", "Podtytuł.")]
-    [InlineData("Caption", "Figure 1.")]
-    [InlineData("Podpis", "Rysunek 1.")]
-    public void TitleStyleEndingWithPeriod_ReturnsError(string styleId, string text)
-    {
-        using var docx = CreateDocxWithStyledParagraph(styleId, text);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("should not end with a period", errors[0].Message);
-        Assert.Contains(styleId, errors[0].Message);
-    }
-
-    [Theory]
-    [InlineData("Heading1", "Introduction")]
-    [InlineData("Heading2", "Chapter One")]
-    [InlineData("Title", "My Thesis Title")]
-    [InlineData("Caption", "Figure 1: Description")]
-    public void TitleStyleNotEndingWithPeriod_ReturnsNoErrors(string styleId, string text)
-    {
-        using var docx = CreateDocxWithStyledParagraph(styleId, text);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Theory]
-    [InlineData("Heading1", "To be continued...")]
-    [InlineData("Title", "The Story Goes On...")]
-    [InlineData("Caption", "And more...")]
-    public void TitleStyleEndingWithEllipsis_ReturnsNoErrors(string styleId, string text)
-    {
-        using var docx = CreateDocxWithStyledParagraph(styleId, text);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Theory]
-    [InlineData("Heading1", "Why This Matters?")]
-    [InlineData("Title", "What Is the Answer?")]
-    [InlineData("Caption", "Is This Correct?")]
-    public void TitleStyleEndingWithQuestionMark_ReturnsNoErrors(string styleId, string text)
-    {
-        using var docx = CreateDocxWithStyledParagraph(styleId, text);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Theory]
-    [InlineData("Heading1", "Important Notice!")]
-    [InlineData("Title", "Breaking News!")]
-    public void TitleStyleEndingWithExclamation_ReturnsNoErrors(string styleId, string text)
-    {
-        using var docx = CreateDocxWithStyledParagraph(styleId, text);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void NormalParagraphEndingWithPeriod_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithNormalParagraph("This is a normal sentence.");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void NonTargetStyleEndingWithPeriod_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithStyledParagraph("Normal", "This is normal text.");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void EmptyHeading_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithStyledParagraph("Heading1", "");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void HeadingWithTrailingSpacesAndPeriod_ReturnsError()
-    {
-        using var docx = CreateDocxWithStyledParagraph("Heading1", "Introduction.   ");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-    }
-
-    [Fact]
-    public void HeadingWithOnlyPeriod_ReturnsError()
-    {
-        using var docx = CreateDocxWithStyledParagraph("Heading1", ".");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-    }
-
-    [Fact]
-    public void HeadingEndingWithColon_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithStyledParagraph("Heading1", "Chapter 1:");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void HeadingWithPeriodInMiddle_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithStyledParagraph("Heading1", "Dr. Smith's Research");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void MultipleHeadingsWithMixedEndings_ReturnsCorrectErrors()
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        mainPart.Document.Body!.Append(new Paragraph(
-            new ParagraphProperties(new ParagraphStyleId { Val = "Heading1" }),
-            new Run(new Text("Chapter One"))
-        ));
-
-        mainPart.Document.Body!.Append(new Paragraph(
-            new ParagraphProperties(new ParagraphStyleId { Val = "Heading2" }),
-            new Run(new Text("Section 1.1."))
-        ));
-
-        mainPart.Document.Body!.Append(new Paragraph(
-            new ParagraphProperties(new ParagraphStyleId { Val = "Title" }),
-            new Run(new Text("My Thesis"))
-        ));
-
-        mainPart.Document.Body!.Append(new Paragraph(
-            new ParagraphProperties(new ParagraphStyleId { Val = "Caption" }),
-            new Run(new Text("Figure 1."))
-        ));
-
-        mainPart.Document.Save();
-        using var docx = new InMemoryDocx(doc, stream);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Equal(2, errors.Count);
-        Assert.Contains("Heading2", errors[0].Message);
-        Assert.Contains("Caption", errors[1].Message);
-    }
-}
diff --git a/backend.Tests/Rules/ParagraphIndentRuleTests.cs b/backend.Tests/Rules/ParagraphIndentRuleTests.cs
deleted file mode 100644
index 49b5ad2..0000000
--- a/backend.Tests/Rules/ParagraphIndentRuleTests.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using backend.Rules;
-using backend.Tests.Helpers;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-
-namespace backend.Tests.Rules;
-
-public class ParagraphIndentRuleTests
-{
-    private readonly ParagraphIndentRule _rule = new();
-
-    private static UniversityConfig CreateConfig() => new();
-
-    private static InMemoryDocx CreateDocxWithParagraph(Paragraph paragraph)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body(paragraph));
-        mainPart.Document.Save();
-
-        return new InMemoryDocx(doc, stream);
-    }
-
-    private static Paragraph CreateParagraph(string text, string? styleId = null)
-    {
-        var paragraphProperties = new ParagraphProperties();
-        if (!string.IsNullOrEmpty(styleId))
-        {
-            paragraphProperties.ParagraphStyleId = new ParagraphStyleId { Val = styleId };
-        }
-
-        return new Paragraph(
-            paragraphProperties,
-            new Run(new Text(text)));
-    }
-
-    private static Paragraph CreateParagraphWithFont(string text, string fontFamily)
-    {
-        return new Paragraph(
-            new Run(
-                new RunProperties(new RunFonts { Ascii = fontFamily, HighAnsi = fontFamily }),
-                new Text(text)));
-    }
-
-    [Fact]
-    public void NormalParagraphWithoutIndent_ReturnsError()
-    {
-        using var docx = CreateDocxWithParagraph(CreateParagraph("Normal paragraph"));
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-    }
-
-    [Fact]
-    public void ExcludedStylePattern_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithParagraph(CreateParagraph("Caption paragraph", "Caption"));
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void CodeBlockParagraph_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithParagraph(
-            CreateParagraphWithFont("public void ValidateDocument() { return; }", "Consolas"));
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-}
diff --git a/backend.Tests/Rules/ParagraphSpacingRuleTests.cs b/backend.Tests/Rules/ParagraphSpacingRuleTests.cs
deleted file mode 100644
index 50fc880..0000000
--- a/backend.Tests/Rules/ParagraphSpacingRuleTests.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-using backend.Models;
-using backend.Tests.Helpers;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using Rules;
-
-namespace backend.Tests.Rules;
-
-public class ParagraphSpacingRuleTests
-{
-    private readonly ParagraphSpacingRule _rule = new();
-
-    private static UniversityConfig CreateConfig(params int[] allowedSpacingPts)
-    {
-        return new UniversityConfig
-        {
-            Formatting = new FormattingConfig
-            {
-                Layout = new LayoutConfig
-                {
-                    ParagraphSpacingRule = allowedSpacingPts.ToList()
-                }
-            }
-        };
-    }
-
-    private static InMemoryDocx CreateDocxWithSpacing(params int[] spacingAfterTwips)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        foreach (var twips in spacingAfterTwips)
-        {
-            var paragraph = new Paragraph(
-                new ParagraphProperties(
-                    new SpacingBetweenLines { After = twips.ToString() }
-                ),
-                new Run(new Text("Test paragraph"))
-            );
-            mainPart.Document.Body!.Append(paragraph);
-        }
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-    private static InMemoryDocx CreateDocxWithStyledSpacing(string styleId, int spacingAfterTwips)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body(
-            new Paragraph(
-                new ParagraphProperties(
-                    new ParagraphStyleId { Val = styleId },
-                    new SpacingBetweenLines { After = spacingAfterTwips.ToString() }),
-                new Run(new Text("Styled paragraph")))));
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-    private static InMemoryDocx CreateDocxWithInheritedStyleSpacing(string styleId, int spacingAfterTwips)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        var stylesPart = mainPart.AddNewPart<StyleDefinitionsPart>();
-        stylesPart.Styles = new Styles(
-            new Style(
-                new StyleParagraphProperties(
-                    new SpacingBetweenLines { After = spacingAfterTwips.ToString() }))
-            {
-                Type = StyleValues.Paragraph,
-                StyleId = styleId
-            });
-
-        mainPart.Document = new Document(new Body(
-            new Paragraph(
-                new ParagraphProperties(new ParagraphStyleId { Val = styleId }),
-                new Run(new Text("Styled paragraph")))));
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-    private static InMemoryDocx CreateDocxWithDefaultStyleSpacing(int spacingAfterTwips)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        var stylesPart = mainPart.AddNewPart<StyleDefinitionsPart>();
-        stylesPart.Styles = new Styles(
-            new Style(
-                new StyleParagraphProperties(
-                    new SpacingBetweenLines { After = spacingAfterTwips.ToString() }))
-            {
-                Type = StyleValues.Paragraph,
-                Default = true,
-                StyleId = "Normal"
-            });
-
-        mainPart.Document = new Document(new Body(
-            new Paragraph(new Run(new Text("Default styled paragraph")))));
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-    [Fact]
-    public void Validate_ParagraphWithCorrectSpacing0pt_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithSpacing(0);
-        var config = CreateConfig(0);
-
-        var errors = _rule.Validate(docx.Document, config, null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void Validate_ParagraphWithCorrectSpacing6pt_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithSpacing(120);
-        var config = CreateConfig(6);
-
-        var errors = _rule.Validate(docx.Document, config, null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void Validate_ParagraphWithWrongSpacing_ReturnsError()
-    {
-        using var docx = CreateDocxWithSpacing(200);
-        var config = CreateConfig(0, 6);
-
-        var errors = _rule.Validate(docx.Document, config, null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("10", errors[0].Message);
-    }
-
-    [Fact]
-    public void Validate_ParagraphWithWrongInheritedStyleSpacing_ReturnsError()
-    {
-        using var docx = CreateDocxWithInheritedStyleSpacing("BodyText", 200);
-        var config = CreateConfig(0, 6);
-
-        var errors = _rule.Validate(docx.Document, config, null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("10", errors[0].Message);
-    }
-
-    [Fact]
-    public void Validate_ParagraphWithWrongDefaultStyleSpacing_ReturnsError()
-    {
-        using var docx = CreateDocxWithDefaultStyleSpacing(200);
-        var config = CreateConfig(0, 6);
-
-        var errors = _rule.Validate(docx.Document, config, null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("10", errors[0].Message);
-    }
-
-    [Fact]
-    public void Validate_MultipleParagraphs_ReturnsErrorsForIncorrectOnes()
-    {
-        using var docx = CreateDocxWithSpacing(0, 120, 200, 120);
-        var config = CreateConfig(0, 6);
-
-        var errors = _rule.Validate(docx.Document, config, null).ToList();
-
-        Assert.Single(errors);
-    }
-
-    [Fact]
-    public void Validate_NoSpacingSet_TreatedAs0Twips()
-    {
-        var stream = new MemoryStream();
-        var wordDoc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-        var mainPart = wordDoc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body(
-            new Paragraph(new Run(new Text("No spacing set")))
-        ));
-        mainPart.Document.Save();
-        using var docx = new InMemoryDocx(wordDoc, stream);
-
-        var config = CreateConfig(0, 6);
-
-        var errors = _rule.Validate(docx.Document, config, null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void Validate_ExcludedStylePattern_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithStyledSpacing("Caption", 200);
-        var config = CreateConfig(0, 6);
-
-        var errors = _rule.Validate(docx.Document, config, null).ToList();
-
-        Assert.Empty(errors);
-    }
-}
diff --git a/backend.Tests/Rules/SingleSpaceRuleTests.cs b/backend.Tests/Rules/SingleSpaceRuleTests.cs
deleted file mode 100644
index 6d1cdaf..0000000
--- a/backend.Tests/Rules/SingleSpaceRuleTests.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using backend.Tests.Helpers;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using Rules;
-
-namespace backend.Tests.Rules;
-
-public class SingleSpaceRuleTests
-{
-    private readonly SingleSpaceRule _rule = new();
-
-    private static UniversityConfig CreateConfig() => new();
-
-    private static InMemoryDocx CreateDocxWithText(params string[] paragraphTexts)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        foreach (var text in paragraphTexts)
-        {
-            var paragraph = new Paragraph(
-                new Run(new Text(text) { Space = SpaceProcessingModeValues.Preserve })
-            );
-            mainPart.Document.Body!.Append(paragraph);
-        }
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-    [Fact]
-    public void SingleSpaces_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithText("This is a normal sentence with single spaces.");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void DoubleSpaces_ReturnsError()
-    {
-        using var docx = CreateDocxWithText("This has  double spaces.");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("2 spaces", errors[0].Message);
-        Assert.Contains("SingleSpaceRule", errors[0].RuleName);
-    }
-
-    [Fact]
-    public void TripleSpaces_ReturnsError()
-    {
-        using var docx = CreateDocxWithText("This has   triple spaces.");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("3 spaces", errors[0].Message);
-    }
-
-    [Fact]
-    public void MultipleViolationsInOneParagraph_ReturnsMultipleErrors()
-    {
-        using var docx = CreateDocxWithText("First  violation and second  violation here.");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Equal(2, errors.Count);
-    }
-
-    [Fact]
-    public void MultipleViolationsInDifferentParagraphs_ReturnsErrors()
-    {
-        using var docx = CreateDocxWithText(
-            "First paragraph  with error.",
-            "Second paragraph  with error too."
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Equal(2, errors.Count);
-        Assert.Equal(1, errors[0].Location.Paragraph);
-        Assert.Equal(2, errors[1].Location.Paragraph);
-    }
-
-    [Fact]
-    public void EmptyParagraph_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithText("");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void WhitespaceOnlyParagraph_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithText("   ");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void ErrorMessageContainsContext()
-    {
-        using var docx = CreateDocxWithText("The word1  word2 in sentence.");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("word1", errors[0].Message);
-        Assert.Contains("word2", errors[0].Message);
-    }
-
-    [Fact]
-    public void LocationIncludesCharacterOffset()
-    {
-        using var docx = CreateDocxWithText("ABC  DEF");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Equal(3, errors[0].Location.CharacterOffset);
-        Assert.Equal(2, errors[0].Location.Length);
-    }
-
-    [Fact]
-    public void MixedContentWithSomeViolations_ReturnsOnlyErrors()
-    {
-        using var docx = CreateDocxWithText(
-            "This is valid.",
-            "This has  an error.",
-            "This is also valid.",
-            "Another  error here."
-        );
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Equal(2, errors.Count);
-        Assert.Equal(2, errors[0].Location.Paragraph);
-        Assert.Equal(4, errors[1].Location.Paragraph);
-    }
-}
diff --git a/backend.Tests/Rules/TextJustificationRuleTests.cs b/backend.Tests/Rules/TextJustificationRuleTests.cs
deleted file mode 100644
index a39a7e2..0000000
--- a/backend.Tests/Rules/TextJustificationRuleTests.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-using backend.Tests.Helpers;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using Rules;
-
-namespace backend.Tests.Rules;
-
-public class TextJustificationRuleTests
-{
-    private readonly TextJustificationRule _rule = new();
-
-    private static UniversityConfig CreateConfig() => new();
-
-    private static InMemoryDocx CreateDocxWithJustification(
-        JustificationValues? justification,
-        string text = "Sample text content.",
-        string? fontFamily = null)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        var paragraphProps = new ParagraphProperties();
-        if (justification.HasValue)
-            paragraphProps.Justification = new Justification { Val = justification.Value };
-
-        var run = new Run(new Text(text));
-        if (!string.IsNullOrEmpty(fontFamily))
-        {
-            run.RunProperties = new RunProperties(
-                new RunFonts { Ascii = fontFamily, HighAnsi = fontFamily });
-        }
-
-        var paragraph = new Paragraph(paragraphProps, run);
-        mainPart.Document.Body!.Append(paragraph);
-        mainPart.Document.Save();
-
-        return new InMemoryDocx(doc, stream);
-    }
-
-    private static InMemoryDocx CreateDocxWithStyle(string styleId, string text = "Sample text content.")
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        var paragraph = new Paragraph(
-            new ParagraphProperties(new ParagraphStyleId { Val = styleId }),
-            new Run(new Text(text))
-        );
-        mainPart.Document.Body!.Append(paragraph);
-        mainPart.Document.Save();
-
-        return new InMemoryDocx(doc, stream);
-    }
-
-    private static InMemoryDocx CreateDocxWithListItem(string text = "List item text.")
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        var paragraph = new Paragraph(
-            new ParagraphProperties(
-                new NumberingProperties(
-                    new NumberingLevelReference { Val = 0 },
-                    new NumberingId { Val = 1 }
-                )
-            ),
-            new Run(new Text(text))
-        );
-        mainPart.Document.Body!.Append(paragraph);
-        mainPart.Document.Save();
-
-        return new InMemoryDocx(doc, stream);
-    }
-
-    [Fact]
-    public void FullJustification_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithJustification(JustificationValues.Both);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void LeftAligned_ReturnsError()
-    {
-        using var docx = CreateDocxWithJustification(JustificationValues.Left);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("left aligned", errors[0].Message);
-        Assert.Contains("full justification", errors[0].Message);
-    }
-
-    [Fact]
-    public void CenterAligned_ReturnsError()
-    {
-        using var docx = CreateDocxWithJustification(JustificationValues.Center);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("center aligned", errors[0].Message);
-    }
-
-    [Fact]
-    public void RightAligned_ReturnsError()
-    {
-        using var docx = CreateDocxWithJustification(JustificationValues.Right);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("right aligned", errors[0].Message);
-    }
-
-    [Fact]
-    public void NoJustificationSet_DefaultsToLeftAndReturnsError()
-    {
-        using var docx = CreateDocxWithJustification(null);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("left aligned", errors[0].Message);
-    }
-
-    [Fact]
-    public void EmptyParagraph_ReturnsNoErrors()
-    {
-        using var docx = CreateDocxWithJustification(JustificationValues.Left, "");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void ListItem_SkippedEvenIfNotJustified()
-    {
-        using var docx = CreateDocxWithListItem();
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Theory]
-    [InlineData("Heading1")]
-    [InlineData("Heading2")]
-    [InlineData("Nagwek1")]
-    [InlineData("Title")]
-    [InlineData("Tytu")]
-    [InlineData("Subtitle")]
-    [InlineData("Podtytu")]
-    [InlineData("TOC1")]
-    [InlineData("TOCHeading")]
-    [InlineData("Spistreci1")]
-    [InlineData("Caption")]
-    [InlineData("Quote")]
-    [InlineData("Cytat")]
-    public void ExcludedStyles_SkippedEvenIfNotJustified(string styleId)
-    {
-        using var docx = CreateDocxWithStyle(styleId);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void NormalStyleLeftAligned_ReturnsError()
-    {
-        using var docx = CreateDocxWithStyle("Normal");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-    }
-
-    [Fact]
-    public void CodeBlockParagraph_SkippedEvenIfNotJustified()
-    {
-        using var docx = CreateDocxWithJustification(
-            JustificationValues.Left,
-            "public void ValidateDocument() { return; }",
-            "Consolas");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Empty(errors);
-    }
-
-    [Fact]
-    public void ErrorMessageContainsTextPreview()
-    {
-        using var docx = CreateDocxWithJustification(JustificationValues.Left, "This is the paragraph text that should appear in the error.");
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Single(errors);
-        Assert.Contains("This is the paragraph", errors[0].Location.Text);
-    }
-
-    [Fact]
-    public void MultipleParagraphsMixedAlignment_ReturnsErrorsOnlyForNonJustified()
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        mainPart.Document.Body!.Append(new Paragraph(
-            new ParagraphProperties(new Justification { Val = JustificationValues.Both }),
-            new Run(new Text("Justified text"))
-        ));
-
-        mainPart.Document.Body!.Append(new Paragraph(
-            new ParagraphProperties(new Justification { Val = JustificationValues.Left }),
-            new Run(new Text("Left aligned text"))
-        ));
-
-        mainPart.Document.Body!.Append(new Paragraph(
-            new ParagraphProperties(new Justification { Val = JustificationValues.Both }),
-            new Run(new Text("Another justified text"))
-        ));
-
-        mainPart.Document.Body!.Append(new Paragraph(
-            new ParagraphProperties(new Justification { Val = JustificationValues.Center }),
-            new Run(new Text("Center aligned text"))
-        ));
-
-        mainPart.Document.Save();
-        using var docx = new InMemoryDocx(doc, stream);
-
-        var errors = _rule.Validate(docx.Document, CreateConfig(), null).ToList();
-
-        Assert.Equal(2, errors.Count);
-        Assert.Contains("left aligned", errors[0].Message);
-        Assert.Contains("center aligned", errors[1].Message);
-    }
-}
diff --git a/backend.Tests/Rules/TocRuleTests.cs b/backend.Tests/Rules/TocRuleTests.cs
deleted file mode 100644
index 12d92fc..0000000
--- a/backend.Tests/Rules/TocRuleTests.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using Rules;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-
-namespace backend.Tests.Rules;
-
-public class TocRuleTests
-{
-    [Fact]
-    public void Validate_WhenAutomaticTocExists_ReturnsNoIssue()
-    {
-        using var docx = CreateDocxWithAutomaticToc();
-
-        var results = new TocRule()
-            .Validate(docx.Document, new UniversityConfig())
-            .ToList();
-
-        Assert.Empty(results);
-    }
-
-    [Theory]
-    [InlineData("Spis tre\u015bci")]
-    [InlineData("Spis tresci")]
-    [InlineData("SPIS TRE\u015aCI")]
-    [InlineData("Spis   Tre\u015bci:")]
-    [InlineData("Spis rzeczy.")]
-    [InlineData("Table of contents")]
-    [InlineData("Contents")]
-    public void Validate_WhenManualTocHeadingExists_ReturnsStructureWarning(string heading)
-    {
-        using var docx = CreateDocx(heading, "Chapter 1");
-
-        var result = Assert.Single(new TocRule().Validate(docx.Document, new UniversityConfig()));
-
-        Assert.False(result.IsError);
-        Assert.Equal(TocRule.ManualTableOfContentsRuleName, result.RuleName);
-        Assert.Equal("Structure", result.Category);
-        Assert.Equal(1, result.Location.Paragraph);
-        Assert.Contains("no automatic Word TOC field", result.Message);
-    }
-
-    [Fact]
-    public void Validate_WhenNoAutomaticOrManualTocExists_KeepsMissingTocError()
-    {
-        using var docx = CreateDocx("Chapter 1", "Body text");
-
-        var result = Assert.Single(new TocRule().Validate(docx.Document, new UniversityConfig()));
-
-        Assert.True(result.IsError);
-        Assert.Equal(nameof(FormattingConfig.CheckTableOfContents), result.RuleName);
-        Assert.Equal("Document is missing a Table of Contents.", result.Message);
-    }
-
-    [Fact]
-    public void Validate_WhenSkipBeforeTocEnabled_IgnoresIssuesBeforeDetectedToc()
-    {
-        using var stream = CreateDocxStream(
-            "Before  issue",
-            "Spis tre\u015bci",
-            "After  issue");
-
-        var config = new UniversityConfig();
-        config.Formatting.SkipBeforeTableOfContents = true;
-
-        var service = new ThesisValidatorService(new IValidationRule[] { new SingleSpaceRule() });
-
-        var results = service.Validate(stream, config).Results.ToList();
-
-        var result = Assert.Single(results);
-        Assert.Contains("After", result.Location.Text);
-    }
-
-    private static InMemoryDocx CreateDocx(params string[] paragraphTexts)
-    {
-        var stream = CreateDocxStream(paragraphTexts);
-        var doc = WordprocessingDocument.Open(stream, true);
-        return new InMemoryDocx(doc, stream);
-    }
-
-    private static InMemoryDocx CreateDocxWithAutomaticToc()
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-        mainPart.Document.Body!.Append(
-            new Paragraph(
-                new Run(new FieldCode("TOC \\o \"1-3\" \\h \\z \\u"))));
-        mainPart.Document.Body.Append(new Paragraph(new Run(new Text("Chapter 1"))));
-        mainPart.Document.Save();
-
-        return new InMemoryDocx(doc, stream);
-    }
-
-    private static MemoryStream CreateDocxStream(params string[] paragraphTexts)
-    {
-        var stream = new MemoryStream();
-        using (var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document))
-        {
-            var mainPart = doc.AddMainDocumentPart();
-            mainPart.Document = new Document(new Body());
-
-            foreach (var paragraphText in paragraphTexts)
-            {
-                mainPart.Document.Body!.Append(
-                    new Paragraph(new Run(new Text(paragraphText))));
-            }
-
-            mainPart.Document.Save();
-        }
-
-        stream.Position = 0;
-        return stream;
-    }
-
-    private sealed class InMemoryDocx : IDisposable
-    {
-        public WordprocessingDocument Document { get; }
-        private readonly MemoryStream _stream;
-
-        public InMemoryDocx(WordprocessingDocument document, MemoryStream stream)
-        {
-            Document = document;
-            _stream = stream;
-        }
-
-        public void Dispose()
-        {
-            Document.Dispose();
-            _stream.Dispose();
-        }
-    }
-}
diff --git a/backend.Tests/Services/CaptionDetectionServiceTests.cs b/backend.Tests/Services/CaptionDetectionServiceTests.cs
deleted file mode 100644
index ec4f4f9..0000000
--- a/backend.Tests/Services/CaptionDetectionServiceTests.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using Backend.Models;
-using DocumentFormat.OpenXml.Wordprocessing;
-using backend.Services.Structure;
-
-namespace backend.Tests.Services;
-
-public class CaptionDetectionServiceTests
-{
-    [Theory]
-    [InlineData("Caption", true)]
-    [InlineData("Legenda", true)]
-    [InlineData("Legend", true)]
-    [InlineData("Normal", false)]
-    [InlineData("Normalny", false)]
-    [InlineData(null, false)]
-    public void UsesDedicatedCaptionStyle_ClassifiesCaptionStyle(string? styleId, bool expected)
-    {
-        var paragraph = CreateParagraph(styleId, "Figure caption");
-
-        var result = CaptionDetectionService.UsesDedicatedCaptionStyle(paragraph);
-
-        Assert.Equal(expected, result);
-    }
-
-    [Fact]
-    public void GetFirstTextRun_ReturnsFirstNonWhitespaceRun()
-    {
-        var paragraph = new Paragraph(
-            new Run(new Text("   ")),
-            new Run(new Text("Caption text")));
-
-        var run = CaptionDetectionService.GetFirstTextRun(paragraph, new UniversityConfig());
-
-        Assert.Equal("Caption text", run!.GetFirstChild<Text>()!.Text);
-    }
-
-    [Theory]
-    [InlineData("Rys 1 Schemat architektury systemu", true)]
-    [InlineData("Rys 1", true)]
-    [InlineData("Rys. 1 Schemat architektury systemu", true)]
-    [InlineData("Rys. 1", true)]
-    [InlineData("Rysunek 1 Schemat architektury systemu", true)]
-    [InlineData("Rysunek 1", true)]
-    [InlineData("Rys. 2.1", true)]
-    [InlineData("Diagram 1 Schemat architektury systemu", false)]
-    [InlineData("Rysunek: 1 Schemat architektury systemu", false)]
-    public void HasValidFigureCaptionFormat_ClassifiesSupportedLabels(string text, bool expected)
-    {
-        Assert.Equal(expected, CaptionDetectionService.HasValidFigureCaptionFormat(text));
-    }
-
-    private static Paragraph CreateParagraph(string? styleId, string text)
-    {
-        var paragraph = new Paragraph(new Run(new Text(text)));
-        if (styleId is not null)
-        {
-            paragraph.PrependChild(
-                new ParagraphProperties(new ParagraphStyleId { Val = styleId }));
-        }
-
-        return paragraph;
-    }
-}
diff --git a/backend.Tests/Services/CodeBlockDetectorTests.cs b/backend.Tests/Services/CodeBlockDetectorTests.cs
deleted file mode 100644
index 477b02b..0000000
--- a/backend.Tests/Services/CodeBlockDetectorTests.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using backend.Services.CodeBlocks;
-using backend.Tests.Helpers;
-using DocumentFormat.OpenXml.Wordprocessing;
-using Microsoft.Extensions.Options;
-
-namespace backend.Tests.Services;
-
-public class CodeBlockDetectorTests
-{
-    [Fact]
-    public void Analyze_ParagraphEntirelyInConsolas_IsCodeBlock()
-    {
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("public async Task<IActionResult> ValidateDocument() { return Ok(); }", "Consolas"));
-
-        var result = AnalyzeFirstParagraph(docx);
-
-        Assert.True(result.IsCodeBlock);
-    }
-
-    [Fact]
-    public void Analyze_ParagraphEntirelyInCourierNew_IsCodeBlock()
-    {
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("SELECT * FROM Documents WHERE Id = @id", "Courier New"));
-
-        var result = AnalyzeFirstParagraph(docx);
-
-        Assert.True(result.IsCodeBlock);
-    }
-
-    [Fact]
-    public void Analyze_NormalProseInTimesNewRoman_IsNotCodeBlock()
-    {
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("This paragraph contains normal prose.", "Times New Roman"));
-
-        var result = AnalyzeFirstParagraph(docx);
-
-        Assert.False(result.IsCodeBlock);
-    }
-
-    [Fact]
-    public void Analyze_InlineCodeIdentifiersBelowRatio_IsNotCodeBlock()
-    {
-        using var docx = DocxTestHelper.CreateInMemoryDocxWithMultipleRuns(
-            ("Metoda ", "Times New Roman"),
-            ("ValidateDocument", "Consolas"),
-            (" uzywa klasy ", "Times New Roman"),
-            ("DocumentParser", "Consolas"),
-            (" do walidacji pracy dyplomowej.", "Times New Roman"));
-
-        var result = AnalyzeFirstParagraph(docx);
-
-        Assert.False(result.IsCodeBlock);
-        Assert.True(result.CodeFontTextRatio < 0.7);
-    }
-
-    [Fact]
-    public void Analyze_EightyPercentCodeFont_IsCodeBlock()
-    {
-        using var docx = DocxTestHelper.CreateInMemoryDocxWithMultipleRuns(
-            ("aaaaaaaa", "Consolas"),
-            ("bb", "Times New Roman"));
-
-        var result = AnalyzeFirstParagraph(docx);
-
-        Assert.True(result.IsCodeBlock);
-        Assert.Equal(0.8, result.CodeFontTextRatio, precision: 3);
-    }
-
-    [Fact]
-    public void Analyze_FortyPercentCodeFont_IsNotCodeBlock()
-    {
-        using var docx = DocxTestHelper.CreateInMemoryDocxWithMultipleRuns(
-            ("aaaa", "Consolas"),
-            ("bbbbbb", "Times New Roman"));
-
-        var result = AnalyzeFirstParagraph(docx);
-
-        Assert.False(result.IsCodeBlock);
-        Assert.Equal(0.4, result.CodeFontTextRatio, precision: 3);
-    }
-
-    [Fact]
-    public void Analyze_EmptyParagraph_IsNotCodeBlock()
-    {
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("", "Consolas"));
-
-        var result = AnalyzeFirstParagraph(docx);
-
-        Assert.False(result.IsCodeBlock);
-        Assert.Equal(0, result.TotalTextLength);
-    }
-
-    [Fact]
-    public void Analyze_RequireWholeParagraphMonospace_MixedHighRatioIsNotCodeBlock()
-    {
-        using var docx = DocxTestHelper.CreateInMemoryDocxWithMultipleRuns(
-            ("aaaaaaaa", "Consolas"),
-            ("bb", "Times New Roman"));
-
-        var result = AnalyzeFirstParagraph(docx, requireWholeParagraphMonospace: true);
-
-        Assert.False(result.IsCodeBlock);
-    }
-
-    [Fact]
-    public void Analyze_RequireWholeParagraphMonospace_WholeParagraphInCodeFontIsCodeBlock()
-    {
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("Console.WriteLine(\"ok\");", "Consolas"));
-
-        var result = AnalyzeFirstParagraph(docx, requireWholeParagraphMonospace: true);
-
-        Assert.True(result.IsCodeBlock);
-    }
-
-    [Fact]
-    public void Analyze_FontMatchingIsCaseInsensitive()
-    {
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("Console.WriteLine(\"ok\");", "consolas"));
-
-        var result = AnalyzeFirstParagraph(docx);
-
-        Assert.True(result.IsCodeBlock);
-        Assert.Equal("consolas", result.MatchedFont);
-    }
-
-    private static CodeBlockDetectionResult AnalyzeFirstParagraph(
-        InMemoryDocx docx,
-        bool requireWholeParagraphMonospace = false)
-    {
-        var detector = CreateDetector(requireWholeParagraphMonospace);
-        var paragraph = docx.Document.MainDocumentPart!.Document.Body!.Elements<Paragraph>().First();
-        return detector.Analyze(paragraph, docx.Document.MainDocumentPart!);
-    }
-
-    private static CodeBlockDetector CreateDetector(bool requireWholeParagraphMonospace = false)
-    {
-        return new CodeBlockDetector(Options.Create(new CodeBlockDetectionOptions
-        {
-            MinimumCodeFontTextRatio = 0.7,
-            RequireWholeParagraphMonospace = requireWholeParagraphMonospace
-        }));
-    }
-}
diff --git a/backend.Tests/Services/DocumentCommentServiceTests.cs b/backend.Tests/Services/DocumentCommentServiceTests.cs
deleted file mode 100644
index c8b5552..0000000
--- a/backend.Tests/Services/DocumentCommentServiceTests.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using backend.Tests.Helpers;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using backend.Services.Comments;
-
-namespace backend.Tests.Services;
-
-public class DocumentCommentServiceTests
-{
-    [Fact]
-    public void AddCommentToRun_WhenDocumentHasExistingComments_UsesNextAvailableId()
-    {
-        using var docx = CreateDocxWithExistingComment("7");
-        var doc = docx.Document;
-        var run = doc.MainDocumentPart!.Document.Body!.Descendants<Run>().First();
-
-        new DocumentCommentService().AddCommentToRun(doc, run, "New validation comment");
-
-        var commentIds = doc.MainDocumentPart.WordprocessingCommentsPart!.Comments!
-            .Elements<Comment>()
-            .Select(comment => comment.Id!.Value)
-            .ToList();
-
-        Assert.Contains("7", commentIds);
-        Assert.Contains("8", commentIds);
-        Assert.Equal(2, commentIds.Count);
-    }
-
-    private static InMemoryDocx CreateDocxWithExistingComment(string commentId)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body(
-            new Paragraph(new Run(new Text("Paragraph with existing comments")))));
-
-        var commentsPart = mainPart.AddNewPart<WordprocessingCommentsPart>();
-        var existingComment = new Comment
-        {
-            Id = commentId,
-            Author = "Existing Author",
-            Initials = "EA"
-        };
-        existingComment.AppendChild(new Paragraph(new Run(new Text("Existing comment"))));
-        commentsPart.Comments = new Comments(existingComment);
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-}
diff --git a/backend.Tests/Services/DocumentStructureTocSkipTests.cs b/backend.Tests/Services/DocumentStructureTocSkipTests.cs
deleted file mode 100644
index aaa0bc9..0000000
--- a/backend.Tests/Services/DocumentStructureTocSkipTests.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using backend.Tests.Helpers;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using backend.Services.Analysis;
-
-namespace backend.Tests.Services;
-
-public class DocumentStructureTocSkipTests
-{
-    [Fact]
-    public void ExtractHeadings_WhenSkipBeforeTocDisabled_ReturnsTocHeading()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            ("Title page", "Normal"),
-            ("Spis tresci", "TOCHeading"),
-            ("Chapter 1", "Heading1"));
-
-        var headings = ThesisValidatorService.ExtractHeadings(docx.Document, new UniversityConfig());
-
-        Assert.Collection(
-            headings,
-            heading => Assert.Equal("Spis tresci", heading.Text),
-            heading => Assert.Equal("Chapter 1", heading.Text));
-    }
-
-    [Fact]
-    public void ExtractHeadings_WhenSkipBeforeTocEnabled_ReturnsTocHeading()
-    {
-        using var docx = CreateDocxWithParagraphs(
-            ("Title page", "Heading1"),
-            ("Spis tresci", "TOCHeading"),
-            ("Chapter 1", "Heading1"));
-
-        var config = new UniversityConfig();
-        config.Formatting.SkipBeforeTableOfContents = true;
-
-        var headings = ThesisValidatorService.ExtractHeadings(docx.Document, config);
-
-        Assert.Collection(
-            headings,
-            heading => Assert.Equal("Spis tresci", heading.Text),
-            heading => Assert.Equal("Chapter 1", heading.Text));
-    }
-
-    private static InMemoryDocx CreateDocxWithParagraphs(params (string Text, string StyleId)[] paragraphs)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        foreach (var (text, styleId) in paragraphs)
-        {
-            mainPart.Document.Body!.Append(new Paragraph(
-                new ParagraphProperties(new ParagraphStyleId { Val = styleId }),
-                new Run(new Text(text))));
-        }
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-}
diff --git a/backend.Tests/Services/FormattingResolutionServiceTests.cs b/backend.Tests/Services/FormattingResolutionServiceTests.cs
deleted file mode 100644
index 44d1b73..0000000
--- a/backend.Tests/Services/FormattingResolutionServiceTests.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using backend.Tests.Helpers;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using backend.Services.Formatting;
-
-namespace backend.Tests.Services;
-
-public class FormattingResolutionServiceTests
-{
-    [Fact]
-    public void ResolveFormatting_UsesDirectParagraphProperties()
-    {
-        using var docx = CreateDocxWithParagraph(
-            new Paragraph(
-                new ParagraphProperties(
-                    new Justification { Val = JustificationValues.Center },
-                    new SpacingBetweenLines { After = "120" }),
-                new Run(new Text("Body"))));
-        var paragraph = GetOnlyParagraph(docx.Document);
-
-        Assert.Equal(JustificationValues.Center, FormattingResolutionService.ResolveJustification(docx.Document, paragraph));
-        Assert.Equal(120, FormattingResolutionService.ResolveSpacingAfter(docx.Document, paragraph));
-    }
-
-    [Fact]
-    public void ResolveFormatting_WalksBasedOnStyleChain()
-    {
-        using var docx = CreateDocxWithStyles(
-            new Styles(
-                new Style(
-                    new StyleParagraphProperties(
-                        new Justification { Val = JustificationValues.Both },
-                        new SpacingBetweenLines { After = "120" },
-                        new Indentation { FirstLine = "567" }),
-                    new StyleRunProperties(new FontSize { Val = "28" }))
-                {
-                    Type = StyleValues.Paragraph,
-                    StyleId = "BaseStyle"
-                },
-                new Style(new BasedOn { Val = "BaseStyle" })
-                {
-                    Type = StyleValues.Paragraph,
-                    StyleId = "ChildStyle"
-                }),
-            "ChildStyle");
-        var paragraph = GetOnlyParagraph(docx.Document);
-        var run = paragraph.Elements<Run>().Single();
-
-        Assert.Equal(JustificationValues.Both, FormattingResolutionService.ResolveJustification(docx.Document, paragraph));
-        Assert.Equal(120, FormattingResolutionService.ResolveSpacingAfter(docx.Document, paragraph));
-        Assert.Equal(567, FormattingResolutionService.ResolveFirstLineIndent(docx.Document, paragraph));
-        Assert.Equal(14.0, FormattingResolutionService.ResolveFontSizePt(docx.Document, paragraph, run));
-    }
-
-    [Fact]
-    public void ResolveFormatting_UsesDefaultParagraphStyle()
-    {
-        using var docx = CreateDocxWithStyles(
-            new Styles(
-                new Style(
-                    new StyleParagraphProperties(new SpacingBetweenLines { After = "240" }))
-                {
-                    Type = StyleValues.Paragraph,
-                    Default = true,
-                    StyleId = "Normal"
-                }),
-            styleId: null);
-        var paragraph = GetOnlyParagraph(docx.Document);
-
-        Assert.Equal(240, FormattingResolutionService.ResolveSpacingAfter(docx.Document, paragraph));
-    }
-
-    [Fact]
-    public void ResolveFormatting_UsesDocumentDefaults()
-    {
-        using var docx = CreateDocxWithStyles(
-            new Styles(
-                new DocDefaults(
-                    new RunPropertiesDefault(
-                        new RunPropertiesBaseStyle(new FontSize { Val = "24" })),
-                    new ParagraphPropertiesDefault(
-                        new ParagraphPropertiesBaseStyle(
-                            new Justification { Val = JustificationValues.Both },
-                            new SpacingBetweenLines { After = "80" })))),
-            styleId: null);
-        var paragraph = GetOnlyParagraph(docx.Document);
-        var run = paragraph.Elements<Run>().Single();
-
-        Assert.Equal(12.0, FormattingResolutionService.ResolveFontSizePt(docx.Document, paragraph, run));
-        Assert.Equal(JustificationValues.Both, FormattingResolutionService.ResolveJustification(docx.Document, paragraph));
-        Assert.Equal(80, FormattingResolutionService.ResolveSpacingAfter(docx.Document, paragraph));
-    }
-
-    private static Paragraph GetOnlyParagraph(WordprocessingDocument doc)
-    {
-        return doc.MainDocumentPart!.Document.Body!.Elements<Paragraph>().Single();
-    }
-
-    private static InMemoryDocx CreateDocxWithParagraph(Paragraph paragraph)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body(paragraph));
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-    private static InMemoryDocx CreateDocxWithStyles(Styles styles, string? styleId)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-        var mainPart = doc.AddMainDocumentPart();
-        var stylesPart = mainPart.AddNewPart<StyleDefinitionsPart>();
-        stylesPart.Styles = styles;
-
-        var paragraphProperties = string.IsNullOrEmpty(styleId)
-            ? new ParagraphProperties()
-            : new ParagraphProperties(new ParagraphStyleId { Val = styleId });
-
-        mainPart.Document = new Document(
-            new Body(
-                new Paragraph(
-                    paragraphProperties,
-                    new Run(new Text("Body")))));
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-}
diff --git a/backend.Tests/Services/HeadingDetectionServiceTests.cs b/backend.Tests/Services/HeadingDetectionServiceTests.cs
deleted file mode 100644
index 091501c..0000000
--- a/backend.Tests/Services/HeadingDetectionServiceTests.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using backend.Tests.Helpers;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using backend.Services.Structure;
-
-namespace backend.Tests.Services;
-
-public class HeadingDetectionServiceTests
-{
-    [Fact]
-    public void GetHeadingLevel_ParsesEnglishStyleId()
-    {
-        using var docx = CreateDocxWithParagraphStyle("Heading2");
-        var paragraph = GetOnlyParagraph(docx.Document);
-
-        var level = HeadingDetectionService.GetHeadingLevel(docx.Document, paragraph);
-
-        Assert.Equal(2, level);
-    }
-
-    [Fact]
-    public void GetHeadingLevel_ParsesPolishAsciiStyleId()
-    {
-        using var docx = CreateDocxWithParagraphStyle("Nagwek3");
-        var paragraph = GetOnlyParagraph(docx.Document);
-
-        var level = HeadingDetectionService.GetHeadingLevel(docx.Document, paragraph);
-
-        Assert.Equal(3, level);
-    }
-
-    [Fact]
-    public void GetHeadingLevel_UsesOutlineLevelFromStyle()
-    {
-        using var docx = CreateDocxWithStyles(
-            "CustomChapter",
-            new Style(new StyleParagraphProperties(new OutlineLevel { Val = 1 }))
-            {
-                Type = StyleValues.Paragraph,
-                StyleId = "CustomChapter"
-            });
-        var paragraph = GetOnlyParagraph(docx.Document);
-
-        var level = HeadingDetectionService.GetHeadingLevel(docx.Document, paragraph);
-
-        Assert.Equal(2, level);
-    }
-
-    [Fact]
-    public void GetHeadingLevel_RejectsTocHeadingStyle()
-    {
-        using var docx = CreateDocxWithStyles(
-            "TOCHeading",
-            new Style(new StyleParagraphProperties(new OutlineLevel { Val = 0 }))
-            {
-                Type = StyleValues.Paragraph,
-                StyleId = "TOCHeading"
-            });
-        var paragraph = GetOnlyParagraph(docx.Document);
-
-        var level = HeadingDetectionService.GetHeadingLevel(docx.Document, paragraph);
-
-        Assert.Null(level);
-    }
-
-    private static Paragraph GetOnlyParagraph(WordprocessingDocument doc)
-    {
-        return doc.MainDocumentPart!.Document.Body!.Elements<Paragraph>().Single();
-    }
-
-    private static InMemoryDocx CreateDocxWithParagraphStyle(string styleId)
-    {
-        return CreateDocxWithStyles(styleId);
-    }
-
-    private static InMemoryDocx CreateDocxWithStyles(string paragraphStyleId, params Style[] styles)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-        var mainPart = doc.AddMainDocumentPart();
-        var stylesPart = mainPart.AddNewPart<StyleDefinitionsPart>();
-        stylesPart.Styles = new Styles(styles);
-        mainPart.Document = new Document(
-            new Body(
-                new Paragraph(
-                    new ParagraphProperties(new ParagraphStyleId { Val = paragraphStyleId }),
-                    new Run(new Text("Heading text")))));
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-}
diff --git a/backend.Tests/Services/SectionContextTests.cs b/backend.Tests/Services/SectionContextTests.cs
deleted file mode 100644
index 7feb4d6..0000000
--- a/backend.Tests/Services/SectionContextTests.cs
+++ /dev/null
@@ -1,286 +0,0 @@
-using backend.Models;
-using backend.Tests.Helpers;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using backend.Services.Analysis;
-using backend.Services.Structure;
-
-namespace backend.Tests.Services;
-
-public class SectionContextTests
-{
-    [Fact]
-    public void PopulateSectionContext_SetsSectionFromNearestHeading()
-    {
-        using var docx = CreateDocxWithHeadings();
-        var doc = docx.Document;
-
-        var results = new List<ValidationResult>
-        {
-            new()
-            {
-                RuleName = "TestRule",
-                Message = "Error in body after Chapter 1",
-                IsError = true,
-                Location = new DocumentLocation { Paragraph = 2, Text = "body text 1" }
-            },
-            new()
-            {
-                RuleName = "TestRule",
-                Message = "Error in body after Section 1.1",
-                IsError = true,
-                Location = new DocumentLocation { Paragraph = 4, Text = "body text 2" }
-            }
-        };
-
-        var headings = ThesisValidatorService.ExtractHeadings(doc);
-        var (elementsMap, descendantsMap) = BuildSectionMaps(doc);
-        PopulateSectionContext(results, elementsMap, descendantsMap);
-
-        Assert.True(elementsMap.Count > 0, "elementsMap should not be empty.");
-        Assert.True(descendantsMap.Count > 0, "descendantsMap should not be empty.");
-        Assert.Equal("Chapter 1", results[0].Location.Section);
-        Assert.Equal("Section 1.1", results[1].Location.Section);
-    }
-
-    [Fact]
-    public void PopulateSectionContext_NoHeadings_LeavesBlank()
-    {
-        using var docx = DocxTestHelper.CreateInMemoryDocx(
-            ("Just a paragraph", null),
-            ("Another paragraph", null)
-        );
-
-        var results = new List<ValidationResult>
-        {
-            new()
-            {
-                RuleName = "TestRule",
-                Message = "Error",
-                IsError = true,
-                Location = new DocumentLocation { Paragraph = 1, Text = "test" }
-            }
-        };
-
-        var (elementsMap, descendantsMap) = BuildSectionMaps(docx.Document);
-        PopulateSectionContext(results, elementsMap, descendantsMap);
-
-        Assert.Empty(results[0].Location.Section);
-    }
-
-    /// <summary>
-    /// Verifies section context works when a table adds extra paragraphs
-    /// between headings (Descendants count diverges from Elements count).
-    /// </summary>
-    [Fact]
-    public void PopulateSectionContext_WithTable_ElementsBasedRuleGetsSection()
-    {
-        using var docx = CreateDocxWithHeadingsAndTable();
-        var doc = docx.Document;
-
-        // Simulate a rule using Elements<Paragraph>() — paragraph index 3 is body text after Heading1
-        // In Elements counting: H1=1, BodyText=2, Table(skipped), H2=3, BodyAfterH2=4
-        // In Descendants counting: H1=1, BodyText=2, TableP1=3, TableP2=4, H2=5, BodyAfterH2=6
-        var results = new List<ValidationResult>
-        {
-            new()
-            {
-                RuleName = "FontFamily",
-                Message = "Wrong font in body after H2",
-                IsError = true,
-                // Elements-based index: paragraph 4 (BodyAfterH2)
-                Location = new DocumentLocation { Paragraph = 4, Text = "body after h2" }
-            }
-        };
-
-        var (elementsMap, descendantsMap) = BuildSectionMaps(doc);
-        PopulateSectionContext(results, elementsMap, descendantsMap);
-
-        // Should find "Heading 2" as nearest section
-        Assert.Equal("Heading 2", results[0].Location.Section);
-    }
-
-    [Fact]
-    public void PopulateSectionContext_WithTable_DescendantsBasedRuleGetsSection()
-    {
-        using var docx = CreateDocxWithHeadingsAndTable();
-        var doc = docx.Document;
-
-        // Simulate a rule using Descendants<Paragraph>() — index 6 is body after H2
-        var results = new List<ValidationResult>
-        {
-            new()
-            {
-                RuleName = "SingleSpaceRule",
-                Message = "Double spaces found",
-                IsError = true,
-                // Descendants-based index: paragraph 6 (BodyAfterH2)
-                Location = new DocumentLocation { Paragraph = 6, Text = "body after h2" }
-            }
-        };
-
-        var (elementsMap, descendantsMap) = BuildSectionMaps(doc);
-        PopulateSectionContext(results, elementsMap, descendantsMap);
-
-        Assert.Equal("Heading 2", results[0].Location.Section);
-    }
-
-    // ── Replicate private methods from ThesisValidatorService ──
-
-    private static (
-        List<(int Index, string Text)> ElementsMap,
-        List<(int Index, string Text)> DescendantsMap
-    ) BuildSectionMaps(WordprocessingDocument doc)
-    {
-        var elementsMap = new List<(int, string)>();
-        var descendantsMap = new List<(int, string)>();
-        var body = doc.MainDocumentPart?.Document.Body;
-        if (body is null) return (elementsMap, descendantsMap);
-
-        int elemIdx = 0;
-        foreach (var para in body.Elements<Paragraph>())
-        {
-            elemIdx++;
-            var level = HeadingDetectionService.GetHeadingLevel(doc, para);
-            if (level is null) continue;
-            var text = string.Concat(para.Descendants<Text>().Select(t => t.Text)).Trim();
-            if (string.IsNullOrWhiteSpace(text)) continue;
-            elementsMap.Add((elemIdx, text));
-        }
-
-        int descIdx = 0;
-        foreach (var para in body.Descendants<Paragraph>())
-        {
-            descIdx++;
-            var level = HeadingDetectionService.GetHeadingLevel(doc, para);
-            if (level is null) continue;
-            var text = string.Concat(para.Descendants<Text>().Select(t => t.Text)).Trim();
-            if (string.IsNullOrWhiteSpace(text)) continue;
-            descendantsMap.Add((descIdx, text));
-        }
-
-        return (elementsMap, descendantsMap);
-    }
-
-    private static readonly HashSet<string> ElementsBasedRules = new(StringComparer.OrdinalIgnoreCase)
-    {
-        "FontFamily", "ListConsistencyRule", "Grammar",
-        "FigureCaptionStyleRule", "EmptySectionStructureRule",
-        "HeadingStyleUsageRule", "CheckTableOfContents",
-    };
-
-    private static void PopulateSectionContext(
-        List<ValidationResult> results,
-        List<(int Index, string Text)> elementsMap,
-        List<(int Index, string Text)> descendantsMap)
-    {
-        foreach (var result in results)
-        {
-            var paraIdx = result.Location?.Paragraph ?? 0;
-            if (paraIdx <= 0) continue;
-
-            var map = ElementsBasedRules.Contains(result.RuleName)
-                ? elementsMap
-                : descendantsMap;
-
-            var section = FindNearestSection(map, paraIdx);
-
-            if (section is not null)
-                result.Location!.Section = section;
-        }
-    }
-
-    private static string? FindNearestSection(List<(int Index, string Text)> map, int paraIdx)
-    {
-        string? nearest = null;
-        foreach (var (idx, text) in map)
-        {
-            if (idx <= paraIdx)
-                nearest = text;
-            else
-                break;
-        }
-        return nearest;
-    }
-
-    // ── Test document builders ──
-
-    private static InMemoryDocx CreateDocxWithHeadings()
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        var stylesPart = mainPart.AddNewPart<StyleDefinitionsPart>();
-        stylesPart.Styles = new Styles(
-            new Style(new StyleParagraphProperties(new OutlineLevel { Val = 0 }))
-            { Type = StyleValues.Paragraph, StyleId = "Heading1", StyleName = new StyleName { Val = "heading 1" } },
-            new Style(new StyleParagraphProperties(new OutlineLevel { Val = 1 }))
-            { Type = StyleValues.Paragraph, StyleId = "Heading2", StyleName = new StyleName { Val = "heading 2" } }
-        );
-
-        var body = mainPart.Document.Body!;
-        body.Append(new Paragraph(new ParagraphProperties(new ParagraphStyleId { Val = "Heading1" }), new Run(new Text("Chapter 1"))));
-        body.Append(new Paragraph(new Run(new Text("This is body text under chapter 1."))));
-        body.Append(new Paragraph(new ParagraphProperties(new ParagraphStyleId { Val = "Heading2" }), new Run(new Text("Section 1.1"))));
-        body.Append(new Paragraph(new Run(new Text("This is body text under section 1.1."))));
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-    /// <summary>
-    /// Creates: Heading1, BodyText, Table(2 cell paragraphs), Heading2, BodyText
-    /// Elements count: H1=1, Body=2, H2=3, Body=4
-    /// Descendants count: H1=1, Body=2, TP1=3, TP2=4, H2=5, Body=6
-    /// </summary>
-    private static InMemoryDocx CreateDocxWithHeadingsAndTable()
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        var stylesPart = mainPart.AddNewPart<StyleDefinitionsPart>();
-        stylesPart.Styles = new Styles(
-            new Style(new StyleParagraphProperties(new OutlineLevel { Val = 0 }))
-            { Type = StyleValues.Paragraph, StyleId = "Heading1", StyleName = new StyleName { Val = "heading 1" } },
-            new Style(new StyleParagraphProperties(new OutlineLevel { Val = 1 }))
-            { Type = StyleValues.Paragraph, StyleId = "Heading2", StyleName = new StyleName { Val = "heading 2" } }
-        );
-
-        var body = mainPart.Document.Body!;
-
-        // Heading 1
-        body.Append(new Paragraph(
-            new ParagraphProperties(new ParagraphStyleId { Val = "Heading1" }),
-            new Run(new Text("Heading 1"))));
-
-        // Body text
-        body.Append(new Paragraph(new Run(new Text("Body text after heading 1."))));
-
-        // Table with 2 cell paragraphs (these show up in Descendants but not Elements)
-        var table = new Table(
-            new TableRow(
-                new TableCell(new Paragraph(new Run(new Text("Cell 1")))),
-                new TableCell(new Paragraph(new Run(new Text("Cell 2"))))
-            )
-        );
-        body.Append(table);
-
-        // Heading 2
-        body.Append(new Paragraph(
-            new ParagraphProperties(new ParagraphStyleId { Val = "Heading2" }),
-            new Run(new Text("Heading 2"))));
-
-        // Body text
-        body.Append(new Paragraph(new Run(new Text("Body text after heading 2."))));
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-}
diff --git a/backend.Tests/Services/SkipDecisionServiceTests.cs b/backend.Tests/Services/SkipDecisionServiceTests.cs
deleted file mode 100644
index 2b8969e..0000000
--- a/backend.Tests/Services/SkipDecisionServiceTests.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using backend.Tests.Helpers;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using V = DocumentFormat.OpenXml.Vml;
-using backend.Services.Skipping;
-
-namespace backend.Tests.Services;
-
-public class SkipDecisionServiceTests
-{
-    [Fact]
-    public void ShouldSkipParagraph_WhenBeforeTocBoundary_ReturnsBeforeTocReason()
-    {
-        using var docx = CreateDocx(new Paragraph(new Run(new Text("Before TOC"))));
-        var paragraph = docx.Document.MainDocumentPart!.Document.Body!.Elements<Paragraph>().Single();
-
-        var decision = SkipDecisionService.ShouldSkipParagraph(
-            docx.Document,
-            paragraph,
-            new UniversityConfig(),
-            new SkipContext(ParagraphIndex: 1, FirstIncludedParagraphIndex: 2));
-
-        Assert.True(decision.ShouldSkip);
-        Assert.Equal(SkipReason.BeforeTableOfContents, decision.Reason);
-    }
-
-    [Fact]
-    public void ShouldSkipParagraph_WhenTocParagraphIsInContext_ReturnsTocReason()
-    {
-        using var docx = CreateDocx(CreateTocFieldParagraph());
-        var config = new UniversityConfig();
-        config.Analysis.SkipTableOfContentsContent = true;
-        var paragraph = docx.Document.MainDocumentPart!.Document.Body!.Elements<Paragraph>().Single();
-        var tocParagraphs = TableOfContentsSkipRule.GetSkippedParagraphs(docx.Document, config);
-
-        var decision = SkipDecisionService.ShouldSkipParagraph(
-            docx.Document,
-            paragraph,
-            config,
-            new SkipContext(ParagraphIndex: 1, TableOfContentsParagraphs: tocParagraphs));
-
-        Assert.True(decision.ShouldSkip);
-        Assert.Equal(SkipReason.TableOfContents, decision.Reason);
-    }
-
-    [Fact]
-    public void ShouldSkipParagraph_WhenTextBoxSkippingEnabled_ReturnsTextBoxReason()
-    {
-        using var docx = CreateDocx(CreateTextBoxParagraph("Text inside box"));
-        var config = new UniversityConfig();
-        config.Analysis.SkipTextBoxes = true;
-        var paragraph = docx.Document.MainDocumentPart!.Document.Body!.Elements<Paragraph>().Single();
-
-        var decision = SkipDecisionService.ShouldSkipParagraph(docx.Document, paragraph, config);
-
-        Assert.True(decision.ShouldSkip);
-        Assert.Equal(SkipReason.TextBox, decision.Reason);
-    }
-
-    private static Paragraph CreateTocFieldParagraph()
-    {
-        return new Paragraph(
-            new Run(new FieldChar { FieldCharType = FieldCharValues.Begin }),
-            new Run(new FieldCode(" TOC \\o \"1-3\" \\h \\z \\u ")),
-            new Run(new FieldChar { FieldCharType = FieldCharValues.End }));
-    }
-
-    private static Paragraph CreateTextBoxParagraph(string text)
-    {
-        return new Paragraph(
-            new Run(
-                new Picture(
-                    new V.Shape(
-                        new V.TextBox(
-                            new TextBoxContent(
-                                new Paragraph(
-                                    new Run(new Text(text)))))))));
-    }
-
-    private static InMemoryDocx CreateDocx(params OpenXmlElement[] bodyChildren)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body(bodyChildren));
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-}
diff --git a/backend.Tests/Services/TextExtractionSkipBehaviorTests.cs b/backend.Tests/Services/TextExtractionSkipBehaviorTests.cs
deleted file mode 100644
index e7c9ea7..0000000
--- a/backend.Tests/Services/TextExtractionSkipBehaviorTests.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using backend.Tests.Helpers;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using V = DocumentFormat.OpenXml.Vml;
-using backend.Services.Analysis;
-using backend.Services.Extraction;
-
-namespace backend.Tests.Services;
-
-public class TextExtractionSkipBehaviorTests
-{
-    [Fact]
-    public void GetParagraphText_WhenTextBoxesAreSkipped_ExcludesTextBoxText()
-    {
-        var paragraph = CreateTextBoxParagraph("Text inside box");
-        var config = new UniversityConfig();
-        config.Analysis.SkipTextBoxes = true;
-
-        var text = TextExtractionService.GetParagraphText(paragraph, config);
-
-        Assert.Equal(string.Empty, text);
-    }
-
-    [Fact]
-    public void GetParagraphText_WhenTextBoxSkippingDisabled_IncludesTextBoxText()
-    {
-        var paragraph = CreateTextBoxParagraph("Text inside box");
-        var config = new UniversityConfig();
-        config.Analysis.SkipTextBoxes = false;
-
-        var text = TextExtractionService.GetParagraphText(paragraph, config);
-
-        Assert.Equal("Text inside box", text);
-    }
-
-    [Fact]
-    public void DescendantParagraphs_WhenSkipBeforeTocEnabled_StartsAfterDetectedToc()
-    {
-        using var docx = CreateDocx(
-            "Before section",
-            "Spis tresci",
-            "Chapter body");
-        var config = new UniversityConfig();
-        config.Analysis.SkipBeforeTableOfContents = true;
-
-        var paragraphs = DocumentAnalysisScope.DescendantParagraphs(docx.Document, config)
-            .Select(item => TextExtractionService.GetParagraphText(item.Paragraph, config))
-            .ToList();
-
-        Assert.Equal(["Chapter body"], paragraphs);
-    }
-
-    [Fact]
-    public void GetParagraphText_PreservesInlineCodeFontRuns()
-    {
-        using var docx = CreateDocxWithRuns(
-            ("body ", "Times New Roman"),
-            ("code", "Consolas"),
-            (" text", "Times New Roman"));
-        var paragraph = docx.Document.MainDocumentPart!.Document.Body!.Elements<Paragraph>().Single();
-        var config = new UniversityConfig();
-
-        var text = TextExtractionService.GetParagraphText(docx.Document, paragraph, config);
-
-        Assert.Equal("body code text", text);
-    }
-
-    private static Paragraph CreateTextBoxParagraph(string text)
-    {
-        return new Paragraph(
-            new Run(
-                new Picture(
-                    new V.Shape(
-                        new V.TextBox(
-                            new TextBoxContent(
-                                new Paragraph(
-                                    new Run(new Text(text)))))))));
-    }
-
-    private static InMemoryDocx CreateDocx(params string[] paragraphTexts)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-
-        foreach (var paragraphText in paragraphTexts)
-        {
-            mainPart.Document.Body!.Append(new Paragraph(new Run(new Text(paragraphText))));
-        }
-
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-
-    private static InMemoryDocx CreateDocxWithRuns(params (string Text, string FontFamily)[] runs)
-    {
-        var stream = new MemoryStream();
-        var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document);
-        var mainPart = doc.AddMainDocumentPart();
-        mainPart.Document = new Document(new Body());
-        var paragraph = new Paragraph();
-
-        foreach (var (text, fontFamily) in runs)
-        {
-            paragraph.Append(
-                new Run(
-                    new RunProperties(new RunFonts { Ascii = fontFamily, HighAnsi = fontFamily }),
-                    new Text(text) { Space = SpaceProcessingModeValues.Preserve }));
-        }
-
-        mainPart.Document.Body!.Append(paragraph);
-        mainPart.Document.Save();
-        return new InMemoryDocx(doc, stream);
-    }
-}
diff --git a/backend.Tests/Services/ThesisValidatorServiceRuleSelectionTests.cs b/backend.Tests/Services/ThesisValidatorServiceRuleSelectionTests.cs
deleted file mode 100644
index 756d41b..0000000
--- a/backend.Tests/Services/ThesisValidatorServiceRuleSelectionTests.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using backend.Models;
-using backend.Services.Analysis;
-using backend.Services.Comments;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-
-namespace backend.Tests.Services;
-
-public class ThesisValidatorServiceRuleSelectionTests
-{
-    [Fact]
-    public void Validate_WithSelectedRules_RunsOnlySelectedRules()
-    {
-        var selectedRule = new RecordingRule("FontFamily");
-        var unselectedRule = new RecordingRule("Grammar");
-        var service = new ThesisValidatorService([selectedRule, unselectedRule]);
-        using var stream = CreateDocxStream();
-
-        service.Validate(stream, new UniversityConfig(), ["FontFamily"]);
-
-        Assert.Equal(1, selectedRule.RunCount);
-        Assert.Equal(0, unselectedRule.RunCount);
-    }
-
-    [Fact]
-    public void Validate_SelectedRuleRunsWhenOnlySeverityIsConfigured()
-    {
-        var selectedRule = new RecordingRule("FontFamily");
-        var service = new ThesisValidatorService([selectedRule]);
-        using var stream = CreateDocxStream();
-        var config = new UniversityConfig();
-        config.Rules.Overrides["FontFamily"] = new RuleOverrideConfig
-        {
-            Severity = ValidationSeverity.Warning
-        };
-
-        service.Validate(stream, config, ["FontFamily"]);
-
-        Assert.Equal(1, selectedRule.RunCount);
-    }
-
-    private static MemoryStream CreateDocxStream()
-    {
-        var stream = new MemoryStream();
-        using (var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document))
-        {
-            var mainPart = doc.AddMainDocumentPart();
-            mainPart.Document = new Document(new Body(new Paragraph(new Run(new Text("Body text")))));
-            mainPart.Document.Save();
-        }
-
-        stream.Position = 0;
-        return stream;
-    }
-
-    private sealed class RecordingRule : IValidationRule
-    {
-        public RecordingRule(string name)
-        {
-            Name = name;
-        }
-
-        public string Name { get; }
-
-        public int RunCount { get; private set; }
-
-        public IEnumerable<ValidationResult> Validate(
-            WordprocessingDocument doc,
-            UniversityConfig config,
-            DocumentCommentService? documentCommentService = null)
-        {
-            RunCount++;
-            return [];
-        }
-    }
-}
diff --git a/backend.Tests/Services/ThesisValidatorServiceSectionContextTests.cs b/backend.Tests/Services/ThesisValidatorServiceSectionContextTests.cs
deleted file mode 100644
index b6c076d..0000000
--- a/backend.Tests/Services/ThesisValidatorServiceSectionContextTests.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.Comments;
-
-namespace backend.Tests.Services;
-
-public class ThesisValidatorServiceSectionContextTests
-{
-    [Fact]
-    public void Validate_UsesResultParagraphIndexKindForSectionContext()
-    {
-        using var stream = CreateDocxWithHeadingsAndTable();
-        var service = new ThesisValidatorService(new IValidationRule[]
-        {
-            new BodyElementIndexedRule()
-        });
-
-        var result = Assert.Single(service.Validate(stream, new UniversityConfig()).Results);
-
-        Assert.Equal("Heading 2", result.Location.Section);
-    }
-
-    private sealed class BodyElementIndexedRule : IValidationRule
-    {
-        public string Name => "BodyElementIndexedRule";
-
-        public IEnumerable<ValidationResult> Validate(
-            WordprocessingDocument doc,
-            UniversityConfig config,
-            DocumentCommentService? documentCommentService = null)
-        {
-            return
-            [
-                new ValidationResult
-                {
-                    RuleName = Name,
-                    Severity = ValidationSeverity.Error,
-                    ParagraphIndexKind = ParagraphIndexKind.BodyElement,
-                    Location = new DocumentLocation
-                    {
-                        Paragraph = 4,
-                        Text = "Body after H2"
-                    }
-                }
-            ];
-        }
-    }
-
-    private static MemoryStream CreateDocxWithHeadingsAndTable()
-    {
-        var stream = new MemoryStream();
-        using (var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document))
-        {
-            var mainPart = doc.AddMainDocumentPart();
-            mainPart.Document = new Document(new Body());
-
-            var stylesPart = mainPart.AddNewPart<StyleDefinitionsPart>();
-            stylesPart.Styles = new Styles(
-                new Style(new StyleParagraphProperties(new OutlineLevel { Val = 0 }))
-                {
-                    Type = StyleValues.Paragraph,
-                    StyleId = "Heading1",
-                    StyleName = new StyleName { Val = "heading 1" }
-                },
-                new Style(new StyleParagraphProperties(new OutlineLevel { Val = 1 }))
-                {
-                    Type = StyleValues.Paragraph,
-                    StyleId = "Heading2",
-                    StyleName = new StyleName { Val = "heading 2" }
-                });
-
-            var body = mainPart.Document.Body!;
-            body.Append(new Paragraph(
-                new ParagraphProperties(new ParagraphStyleId { Val = "Heading1" }),
-                new Run(new Text("Heading 1"))));
-            body.Append(new Paragraph(new Run(new Text("Body after H1"))));
-            body.Append(new Table(
-                new TableRow(
-                    new TableCell(new Paragraph(new Run(new Text("Cell 1")))),
-                    new TableCell(new Paragraph(new Run(new Text("Cell 2")))))));
-            body.Append(new Paragraph(
-                new ParagraphProperties(new ParagraphStyleId { Val = "Heading2" }),
-                new Run(new Text("Heading 2"))));
-            body.Append(new Paragraph(new Run(new Text("Body after H2"))));
-
-            mainPart.Document.Save();
-        }
-
-        stream.Position = 0;
-        return stream;
-    }
-}
diff --git a/backend.Tests/Services/ValidationResultFactoryTests.cs b/backend.Tests/Services/ValidationResultFactoryTests.cs
deleted file mode 100644
index b2afd70..0000000
--- a/backend.Tests/Services/ValidationResultFactoryTests.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using ThesisValidator.Rules;
-using backend.Services.Results;
-
-namespace backend.Tests.Services;
-
-public class ValidationResultFactoryTests
-{
-    [Fact]
-    public void Create_UsesRuleCatalogDefaults()
-    {
-        var result = ValidationResultFactory.ForParagraph(
-            "FontFamily",
-            new UniversityConfig(),
-            "Wrong font",
-            2,
-            "body");
-
-        Assert.Equal("FontFamily", result.RuleName);
-        Assert.Equal("Error", result.Severity);
-        Assert.True(result.IsError);
-        Assert.Equal("Formatting", result.Category);
-        Assert.Equal(2, result.Location.Paragraph);
-    }
-
-    [Fact]
-    public void Create_ConfiguredSeverityOverridesRuleDefaultAndExplicitSeverity()
-    {
-        var config = new UniversityConfig();
-        config.Rules.Overrides["FontFamily"] = new RuleOverrideConfig
-        {
-            Severity = "Warning"
-        };
-
-        var result = ValidationResultFactory.Create(
-            "FontFamily",
-            config,
-            "Wrong font",
-            severity: ValidationSeverity.Error);
-
-        Assert.Equal("Warning", result.Severity);
-        Assert.False(result.IsError);
-    }
-
-    [Fact]
-    public void IsErrorSetter_KeepsSeverityBackwardCompatible()
-    {
-        var result = new ValidationResult { IsError = false };
-
-        Assert.Equal("Warning", result.Severity);
-
-        result.IsError = true;
-
-        Assert.Equal("Error", result.Severity);
-    }
-
-    [Fact]
-    public void RuleCatalog_KeepsManualTocAsNonSelectableWarning()
-    {
-        var definition = RuleCatalog.GetDefinition("Manual table of contents");
-
-        Assert.False(definition.Selectable);
-        Assert.Equal("Warning", definition.DefaultSeverity);
-        Assert.Equal("Structure", definition.Category);
-    }
-
-}
diff --git a/backend/Endpoints/DocumentUploadRequest.cs b/backend/Endpoints/DocumentUploadRequest.cs
deleted file mode 100644
index 2d8d56f..0000000
--- a/backend/Endpoints/DocumentUploadRequest.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Microsoft.AspNetCore.Http;
-
-namespace backend.Endpoints;
-
-internal sealed record DocumentUploadRequest(
-    IFormFile File,
-    string FileName,
-    IReadOnlyList<string> SelectedRules,
-    bool SkipBeforeTableOfContents,
-    bool? SkipTextBoxes);
diff --git a/backend/Folder.DotSettings.user b/backend/Folder.DotSettings.user
deleted file mode 100644
index fb0b5f2..0000000
--- a/backend/Folder.DotSettings.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEndpointRouteBuilderExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F1b20dbd6f8b5b39f8631f761b1abcb0f6778d44cfed716654927bcc5427e_003FEndpointRouteBuilderExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AValidationResult_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fc4df319e7a6b4eafe890fea08520cf9412a8d289df8bfa8057fc4621f45f6892_003FValidationResult_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/backend/Models/UniversityConfig.cs b/backend/Models/UniversityConfig.cs
deleted file mode 100644
index 6ecf979..0000000
--- a/backend/Models/UniversityConfig.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-namespace Backend.Models;
-
-public class UniversityConfig
-{
-    public string Name { get; set; } = "Default University";
-    public string Language { get; set; } = "pl-PL";
-    public FormattingConfig Formatting { get; set; } = new FormattingConfig();
-    public AnalysisConfig Analysis { get; set; } = new AnalysisConfig();
-    public RuleSettingsConfig Rules { get; set; } = new RuleSettingsConfig();
-}
-
-public class FormattingConfig
-{
-    public FontConfig Font { get; set; } = new FontConfig();
-    public LayoutConfig Layout { get; set; } = new LayoutConfig();
-    public bool CheckTableOfContents { get; set; } = true;
-    public bool SkipBeforeTableOfContents { get; set; }
-    public bool SkipTextBoxes { get; set; } = true;
-    public bool SkipTableOfContentsContent { get; set; } = true;
-}
-
-public class AnalysisConfig
-{
-    public bool? SkipBeforeTableOfContents { get; set; }
-    public bool? SkipTextBoxes { get; set; }
-    public bool? SkipTableOfContentsContent { get; set; }
-}
-
-public class RuleSettingsConfig
-{
-    public Dictionary<string, RuleOverrideConfig> Overrides { get; set; } =
-        new(StringComparer.OrdinalIgnoreCase);
-
-    public RuleOverrideConfig? GetOverride(string ruleId)
-    {
-        if (Overrides.TryGetValue(ruleId, out var ruleOverride))
-            return ruleOverride;
-
-        var match = Overrides.FirstOrDefault(pair =>
-            string.Equals(pair.Key, ruleId, StringComparison.OrdinalIgnoreCase));
-
-        return string.IsNullOrEmpty(match.Key) ? null : match.Value;
-    }
-}
-
-public class RuleOverrideConfig
-{
-    public string? Severity { get; set; }
-}
-
-public class FontConfig
-{
-    public string FontFamily { get; set; } = "Times New Roman";
-    public int FontSize { get; set; } = 12;
-}
-
-public class LayoutConfig
-{
-    public double MarginLeft { get; set; } = 2.5;
-    public double MarginRight { get; set; } = 2.5;
-    public double RequiredIndentCm { get; set; } = 1.25;
-    public List<int> ParagraphSpacingRule { get; set; } = new List<int>() { 0, 6 };
-}
diff --git a/backend/Models/ValidationResult.cs b/backend/Models/ValidationResult.cs
deleted file mode 100644
index c08b2a5..0000000
--- a/backend/Models/ValidationResult.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace backend.Models;
-
-public static class ValidationSeverity
-{
-    public const string Error = "Error";
-    public const string Warning = "Warning";
-
-    public static string Normalize(string? severity)
-    {
-        return string.Equals(severity, Warning, StringComparison.OrdinalIgnoreCase)
-            ? Warning
-            : Error;
-    }
-}
-
-public enum ParagraphIndexKind
-{
-    Descendant,
-    BodyElement
-}
-
-public class ValidationResult
-{
-    private string _severity = ValidationSeverity.Error;
-
-    public string RuleName { get; set; } = string.Empty;
-    public string Message { get; set; } = string.Empty;
-
-    public bool IsError
-    {
-        get => string.Equals(Severity, ValidationSeverity.Error, StringComparison.OrdinalIgnoreCase);
-        set => Severity = value ? ValidationSeverity.Error : ValidationSeverity.Warning;
-    }
-
-    public string Severity
-    {
-        get => _severity;
-        set => _severity = ValidationSeverity.Normalize(value);
-    }
-
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public string? Category { get; set; }
-
-    [JsonIgnore]
-    public ParagraphIndexKind ParagraphIndexKind { get; set; } = ParagraphIndexKind.Descendant;
-
-    public DocumentLocation Location { get; set; } = new();
-}
-
-/// <summary>
-/// Represents the exact location of a validation issue within a document.
-/// </summary>
-public class DocumentLocation
-{
-    private const int ApproximateLinesPerPage = 30;
-    private int _pageNumber;
-    private int _lineNumber;
-
-    /// <summary>
-    /// Approximate page number (1-based). Calculated based on page breaks and paragraph count.
-    /// </summary>
-    public int PageNumber
-    {
-        get => _pageNumber > 0 ? _pageNumber : EstimatePageNumber();
-        set => _pageNumber = value;
-    }
-
-    /// <summary>
-    /// Approximate line number within the page (1-based).
-    /// </summary>
-    public int LineNumber
-    {
-        get => _lineNumber > 0 ? _lineNumber : EstimateLineNumber();
-        set => _lineNumber = value;
-    }
-
-    /// <summary>
-    /// 1-based paragraph index in the document body.
-    /// </summary>
-    public int Paragraph { get; set; }
-
-    /// <summary>
-    /// 1-based run index within the paragraph.
-    /// </summary>
-    public int Run { get; set; }
-
-    /// <summary>
-    /// Character offset from the start of the paragraph.
-    /// </summary>
-    public int CharacterOffset { get; set; }
-
-    /// <summary>
-    /// Length of the affected text.
-    /// </summary>
-    public int Length { get; set; }
-
-    /// <summary>
-    /// The text content at this location (may be truncated).
-    /// </summary>
-    public string Text { get; set; } = string.Empty;
-
-    /// <summary>
-    /// The nearest heading / section this issue falls under (e.g. "1.2 Background").
-    /// Populated automatically after validation.
-    /// </summary>
-    public string Section { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Human-readable description of the location.
-    /// </summary>
-    public string Description => string.IsNullOrEmpty(Section)
-        ? DescribeParagraphLocation()
-        : Section;
-
-    public override string ToString() => Description;
-
-    private int EstimatePageNumber()
-    {
-        return Paragraph <= 0
-            ? 0
-            : ((Paragraph - 1) / ApproximateLinesPerPage) + 1;
-    }
-
-    private int EstimateLineNumber()
-    {
-        return Paragraph <= 0
-            ? 0
-            : ((Paragraph - 1) % ApproximateLinesPerPage) + 1;
-    }
-
-    private string DescribeParagraphLocation()
-    {
-        return Paragraph <= 0
-            ? "Document"
-            : $"Page {PageNumber}, Line {LineNumber}, Paragraph {Paragraph}";
-    }
-}
-
-public class HeadingInfo
-{
-    public int Level { get; set; }
-    public string Text { get; set; } = string.Empty;
-}
diff --git a/backend/Program.cs b/backend/Program.cs
deleted file mode 100644
index a3bb55b..0000000
--- a/backend/Program.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System.Reflection;
-using backend.Endpoints;
-using backend.Models;
-using backend.Services.Analysis;
-using backend.Services.CodeBlocks;
-using backend.Services.Language;
-using Backend.Models;
-using ThesisValidator.Rules;
-
-var builder = WebApplication.CreateBuilder(args);
-
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-builder.Services.AddCors(options =>
-{
-    options.AddPolicy("AllowFrontend", policy =>
-    {
-        policy.WithOrigins("http://localhost:4200")
-              .AllowAnyHeader()
-              .AllowAnyMethod();
-    });
-});
-
-builder.Services.Configure<UniversityConfig>(
-    builder.Configuration.GetSection("UniversityConfig"));
-
-builder.Services.AddOptions<CodeBlockDetectionOptions>()
-    .Bind(builder.Configuration.GetSection(CodeBlockDetectionOptions.SectionName))
-    .Validate(
-        options => options.MinimumCodeFontTextRatio > 0 && options.MinimumCodeFontTextRatio <= 1,
-        "CodeBlockDetection:MinimumCodeFontTextRatio must be greater than 0 and less than or equal to 1.")
-    .Validate(
-        options => options.CodeFonts is not null
-            && options.CodeFonts.Any(font => !string.IsNullOrWhiteSpace(font)),
-        "CodeBlockDetection:CodeFonts must contain at least one font.")
-    .ValidateOnStart();
-
-builder.Services.AddSingleton<ICodeBlockDetector, CodeBlockDetector>();
-
-builder.Services.AddHttpClient<LanguageToolService>();
-builder.Services.AddScoped<LanguageToolService>();
-
-var assembly = typeof(Program).Assembly;
-var ruleTypes = assembly.
-    GetTypes().
-    Where(t => typeof(IValidationRule).IsAssignableFrom(t)
-                                              && !t.IsInterface
-                                              && !t.IsAbstract);
-foreach (var ruleType in ruleTypes)
-{
-    builder.Services.AddScoped(typeof(IValidationRule), ruleType);
-}
-
-builder.Services.AddScoped<ThesisValidatorService>();
-var app = builder.Build();
-
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
-app.UseCors("AllowFrontend");
-
-app.MapDocumentEndpoint();
-
-app.UseHttpsRedirection();
-
-app.Run();
diff --git a/backend/Rules/EmptySectionStructureRule.cs b/backend/Rules/EmptySectionStructureRule.cs
deleted file mode 100644
index 27e1c2f..0000000
--- a/backend/Rules/EmptySectionStructureRule.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Results;
-using backend.Services.Skipping;
-using backend.Services.Structure;
-
-namespace backend.Rules;
-
-/// <summary>
-/// A subchapter heading (e.g. Heading 2) cannot immediately follow its parent
-/// chapter heading (e.g. Heading 1) without any intervening body text.
-/// Every section must contain at least a brief introductory paragraph
-/// before the first sub-section begins.
-/// </summary>
-public class EmptySectionStructureRule : IValidationRule
-{
-    public string Name => "EmptySectionStructureRule";
-
-    public IEnumerable<ValidationResult> Validate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? commentService = null)
-    {
-        var errors = new List<ValidationResult>();
-        var body = doc.MainDocumentPart?.Document.Body;
-        if (body is null) return errors;
-
-        int? lastHeadingLevel = null;
-        int lastHeadingParaIdx = 0;
-        string lastHeadingPreview = "";
-        Paragraph? lastHeadingParagraph = null;
-        bool hasBodyContentSinceHeading = false;
-
-        int paragraphIndex = 0;
-        int childIndex = 0;
-        var firstIncludedChildIndex = DocumentAnalysisScope.GetFirstIncludedBodyChildIndex(doc, config);
-        var tocParagraphs = TableOfContentsSkipRule.GetSkippedParagraphs(doc, config);
-
-        foreach (var element in body.ChildElements)
-        {
-            if (element is Paragraph)
-                paragraphIndex++;
-
-            if (childIndex++ < firstIncludedChildIndex)
-                continue;
-
-            // Tables, SdtBlocks, etc. count as body content.
-            if (element is not Paragraph paragraph)
-            {
-                if (lastHeadingLevel is not null)
-                    hasBodyContentSinceHeading = true;
-                continue;
-            }
-
-            var skipDecision = SkipDecisionService.ShouldSkipParagraph(
-                doc,
-                paragraph,
-                config,
-                new SkipContext(paragraphIndex, null, tocParagraphs));
-            if (skipDecision.ShouldSkip)
-                continue;
-
-            var level = HeadingDetectionService.GetHeadingLevel(doc, paragraph);
-
-            if (level is not null)
-            {
-                // Current element is a heading.
-                if (lastHeadingLevel is not null
-                    && level > lastHeadingLevel
-                    && !hasBodyContentSinceHeading)
-                {
-                    var currentText = TextExtractionService.Truncate(
-                        TextExtractionService.GetParagraphText(doc, paragraph, config).Trim(),
-                        50);
-
-                    var msg =
-                        $"Heading {lastHeadingLevel} \"{lastHeadingPreview}\" " +
-                        $"is immediately followed by Heading {level} \"{currentText}\" " +
-                        "with no introductory text. Add at least one paragraph of body text " +
-                        "before the first sub-section.";
-
-                    errors.Add(ValidationResultFactory.ForParagraph(
-                        Name,
-                        config,
-                        msg,
-                        lastHeadingParaIdx,
-                        lastHeadingPreview,
-                        ParagraphIndexKind.BodyElement));
-
-                    if (lastHeadingParagraph is not null)
-                        commentService?.AddCommentToParagraph(doc, lastHeadingParagraph, msg);
-                }
-
-                lastHeadingLevel = level;
-                lastHeadingParaIdx = paragraphIndex;
-                lastHeadingPreview = TextExtractionService.Truncate(
-                    TextExtractionService.GetParagraphText(doc, paragraph, config).Trim(),
-                    60);
-                lastHeadingParagraph = paragraph;
-                hasBodyContentSinceHeading = false;
-            }
-            else
-            {
-                // Non-heading paragraph — any visible text counts as body content.
-                if (!hasBodyContentSinceHeading
-                    && !string.IsNullOrWhiteSpace(TextExtractionService.GetParagraphText(doc, paragraph, config)))
-                {
-                    hasBodyContentSinceHeading = true;
-                }
-            }
-        }
-
-        return errors;
-    }
-}
diff --git a/backend/Rules/FigureCaptionAutomaticNumberingRule.cs b/backend/Rules/FigureCaptionAutomaticNumberingRule.cs
deleted file mode 100644
index 9bf2e71..0000000
--- a/backend/Rules/FigureCaptionAutomaticNumberingRule.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using backend.Models;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Results;
-using backend.Services.Structure;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using ThesisValidator.Rules;
-
-namespace backend.Rules;
-
-/// <summary>
-/// Warns when a visually valid figure caption appears to be manually numbered.
-/// </summary>
-public class FigureCaptionAutomaticNumberingRule : IValidationRule
-{
-    public string Name => "FigureCaptionAutomaticNumberingRule";
-
-    public IEnumerable<ValidationResult> Validate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? commentService = null)
-    {
-        var warnings = new List<ValidationResult>();
-
-        foreach (var caption in FigureCaptionDetector.GetDetectedFigureCaptions(doc, config))
-        {
-            var text = caption.Text.Trim();
-            if (!CaptionDetectionService.HasValidFigureCaptionFormat(text))
-                continue;
-
-            if (!caption.UsesDedicatedCaptionStyle)
-                continue;
-
-            if (caption.HasFigureSequenceField)
-                continue;
-
-            var message =
-                "Podpis rysunku wygl\u0105da na wpisany r\u0119cznie. Zalecane jest u\u017cycie funkcji Worda 'Wstaw podpis', aby numeracja rysunk\u00f3w by\u0142a automatyczna.";
-            warnings.Add(ValidationResultFactory.ForParagraph(
-                Name,
-                config,
-                message,
-                caption.ParagraphIndex,
-                TextExtractionService.Truncate(text, 50),
-                ParagraphIndexKind.Descendant,
-                ValidationSeverity.Warning));
-
-            commentService?.AddCommentToParagraph(doc, caption.Paragraph, message);
-        }
-
-        return warnings;
-    }
-}
diff --git a/backend/Rules/FigureCaptionFormatRule.cs b/backend/Rules/FigureCaptionFormatRule.cs
deleted file mode 100644
index bc23139..0000000
--- a/backend/Rules/FigureCaptionFormatRule.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using backend.Models;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Results;
-using backend.Services.Structure;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using ThesisValidator.Rules;
-
-namespace backend.Rules;
-
-/// <summary>
-/// Validates the visible text format of existing figure captions.
-/// </summary>
-public class FigureCaptionFormatRule : IValidationRule
-{
-    public string Name => "FigureCaptionFormatRule";
-
-    public IEnumerable<ValidationResult> Validate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? commentService = null)
-    {
-        var errors = new List<ValidationResult>();
-
-        foreach (var caption in FigureCaptionDetector.GetDetectedFigureCaptions(doc, config))
-        {
-            var text = caption.Text.Trim();
-            var preview = TextExtractionService.Truncate(text, 50);
-
-            if (!CaptionDetectionService.HasValidFigureCaptionFormat(text))
-            {
-                var message = "Figure caption has invalid format - use a label such as \"Rys.\" or \"Rysunek\", a number, and a description.";
-                errors.Add(MakeResult(config, message, caption.ParagraphIndex, preview));
-                commentService?.AddCommentToParagraph(doc, caption.Paragraph, message);
-                continue;
-            }
-
-            if (CaptionDetectionService.EndsWithSinglePeriod(text))
-            {
-                var message = "Figure caption should not end with a period.";
-                errors.Add(MakeResult(config, message, caption.ParagraphIndex, preview));
-                commentService?.AddCommentToParagraph(doc, caption.Paragraph, message);
-            }
-        }
-
-        return errors;
-    }
-
-    private ValidationResult MakeResult(
-        UniversityConfig config,
-        string message,
-        int paragraph,
-        string text)
-    {
-        return ValidationResultFactory.ForParagraph(
-            Name,
-            config,
-            message,
-            paragraph,
-            text,
-            ParagraphIndexKind.Descendant);
-    }
-}
diff --git a/backend/Rules/FigureCaptionPositionRule.cs b/backend/Rules/FigureCaptionPositionRule.cs
deleted file mode 100644
index 2c4dd14..0000000
--- a/backend/Rules/FigureCaptionPositionRule.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using backend.Models;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Results;
-using backend.Services.Structure;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using ThesisValidator.Rules;
-
-namespace backend.Rules;
-
-/// <summary>
-/// Validates that an existing figure caption is placed below its figure.
-/// </summary>
-public class FigureCaptionPositionRule : IValidationRule
-{
-    // The validator infrastructure uses this identifier to label results
-    // and to look up rule metadata/configuration.
-    public string Name => "FigureCaptionPositionRule";
-
-    public IEnumerable<ValidationResult> Validate(
-        // OpenXML SDK representation of the .docx package. The rule reads
-        // paragraphs, drawings, styles, and other WordprocessingML content from here.
-        WordprocessingDocument doc,
-        // University-specific validation settings. This is passed through to
-        // helper services so they can honor skip rules and severity settings.
-        UniversityConfig config,
-        // Optional helper that can inject a real Word comment into the offending
-        // paragraph, so the issue is visible inside Microsoft Word as well.
-        DocumentCommentService? commentService = null)
-    {
-        // We collect every detected violation here and return them at the end.
-        var errors = new List<ValidationResult>();
-
-        // FigureCaptionDetector.AssociateFiguresWithCaptions(doc, config):
-        // 1. Walks the document paragraphs in document order, including nested
-        //    paragraphs such as those inside table cells.
-        // 2. Uses FigureDetectionService to find paragraphs containing visual figures.
-        // 3. Searches nearby paragraphs for a matching caption.
-        // 4. Returns one FigureCaptionAssociation per figure, describing:
-        //    - the figure paragraph,
-        //    - the caption paragraph if found,
-        //    - the relation (Below / Above / SeparatedBelow / None).
-        foreach (var association in FigureCaptionDetector.AssociateFiguresWithCaptions(
-                     doc,
-                     config,
-                     requireStructuredCaption: true))
-        {
-            // If no caption was found, this rule does nothing because missing captions
-            // are handled by a different rule.
-            //
-            // If IsCaptionBelowFigure is true, the relation is exactly "Below", which
-            // means the caption is in the correct position and there is nothing to report.
-            if (association.Caption is null || association.IsCaptionBelowFigure)
-                continue;
-
-            // association.Caption.Text was already extracted from the caption paragraph.
-            // Truncate(...) shortens it to at most 50 characters so UI/result payloads
-            // show a compact preview instead of the full caption text.
-            var preview = TextExtractionService.Truncate(association.Caption.Text, 50);
-
-            // The message depends on how the detector classified the caption:
-            // - Above: caption appears before the figure.
-            // - SeparatedBelow: caption is below the figure, but not directly below;
-            //   some other non-empty/intervening content was found in between.
-            var message = association.Relation == FigureCaptionRelationKind.Above
-                ? "Figure caption should be placed below the figure."
-                : "Figure caption should be placed directly below the figure without intervening content.";
-
-            // ValidationResultFactory.ForParagraph(...) creates a standardized
-            // ValidationResult object with:
-            // - the current rule id,
-            // - severity/category resolved from config + rule catalog,
-            // - a DocumentLocation pointing at the caption paragraph,
-            // - the preview text shown to the user.
-            //
-            // association.Caption.ParagraphIndex is the 1-based descendant paragraph index
-            // captured by FigureCaptionDetector while scanning the document.
-            //
-            // ParagraphIndexKind.Descendant tells downstream consumers that this index
-            // refers to the full document-order descendant paragraph traversal.
-            errors.Add(ValidationResultFactory.ForParagraph(
-                Name,
-                config,
-                message,
-                association.Caption.ParagraphIndex,
-                preview,
-                ParagraphIndexKind.Descendant));
-
-            // If commentService is not null, add a Word comment directly to the caption
-            // paragraph. Under the hood, AddCommentToParagraph(...) creates/reuses the
-            // comments part in the .docx package and inserts comment markers so Word can
-            // display the validation message inline in the document.
-            commentService?.AddCommentToParagraph(doc, association.Caption.Paragraph, message);
-        }
-
-        // Return every caption-position issue found for this document.
-        return errors;
-    }
-}
diff --git a/backend/Rules/FigureCaptionStyleRule.cs b/backend/Rules/FigureCaptionStyleRule.cs
deleted file mode 100644
index 15a57ff..0000000
--- a/backend/Rules/FigureCaptionStyleRule.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Formatting;
-using backend.Services.Results;
-using backend.Services.Structure;
-
-namespace backend.Rules;
-
-/// <summary>
-/// Validates the Word style and paragraph formatting of existing figure captions.
-/// </summary>
-public class FigureCaptionStyleRule : IValidationRule
-{
-    public string Name => "FigureCaptionStyleRule";
-
-    private const double ExpectedFontSizePt = 11.0;
-    private const int IndentToleranceTwips = 10;
-
-    public IEnumerable<ValidationResult> Validate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? commentService = null)
-    {
-        var errors = new List<ValidationResult>();
-
-        foreach (var captionCandidate in FigureCaptionDetector.GetDetectedFigureCaptions(doc, config))
-        {
-            var caption = captionCandidate.Paragraph;
-            var captionIdx = captionCandidate.ParagraphIndex;
-            var preview = TextExtractionService.Truncate(captionCandidate.Text, 50);
-            if (!CaptionDetectionService.UsesDedicatedCaptionStyle(doc, caption))
-            {
-                var label = CaptionDetectionService.GetCaptionStyleLabel(doc, caption);
-                var msg = $"Figure caption uses \"{label}\" style - assign a Caption style (e.g., \"Caption\", \"Legenda\").";
-                errors.Add(MakeResult(config, msg, captionIdx, preview));
-                commentService?.AddCommentToParagraph(doc, caption, msg);
-            }
-
-            CheckFontSize(doc, config, caption, captionIdx, preview, errors);
-            CheckAlignment(doc, config, caption, captionIdx, preview, errors);
-            CheckIndentation(doc, config, caption, captionIdx, preview, errors);
-        }
-
-        return errors;
-    }
-
-    private void CheckFontSize(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        Paragraph caption,
-        int paraIndex,
-        string preview,
-        List<ValidationResult> errors)
-    {
-        var textRun = CaptionDetectionService.GetFirstTextRun(caption, config);
-        if (textRun is null)
-            return;
-
-        var pt = FormattingResolutionService.ResolveFontSizePt(doc, caption, textRun);
-        if (pt is null)
-            return;
-
-        if (Math.Abs(pt.Value - ExpectedFontSizePt) > 0.01)
-        {
-            errors.Add(MakeResult(
-                config,
-                $"Figure caption font size must be 11pt, found {pt:0.##}pt.",
-                paraIndex,
-                preview));
-        }
-    }
-
-    private void CheckAlignment(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        Paragraph caption,
-        int paraIndex,
-        string preview,
-        List<ValidationResult> errors)
-    {
-        var justification = FormattingResolutionService.ResolveJustification(
-            doc,
-            caption,
-            includeDefaultStyle: false);
-        if (justification == JustificationValues.Center)
-            return;
-
-        var name = justification == JustificationValues.Right
-            ? "right-aligned"
-            : justification == JustificationValues.Both
-                ? "justified"
-                : "left-aligned";
-
-        errors.Add(MakeResult(
-            config,
-            $"Figure caption must be centered, found {name}.",
-            paraIndex,
-            preview));
-    }
-
-    private void CheckIndentation(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        Paragraph caption,
-        int paraIndex,
-        string preview,
-        List<ValidationResult> errors)
-    {
-        var (left, firstLine) = FormattingResolutionService.ResolveIndentation(
-            doc,
-            caption,
-            includeDefaultStyle: false);
-        if (Math.Abs(left) <= IndentToleranceTwips && Math.Abs(firstLine) <= IndentToleranceTwips)
-            return;
-
-        errors.Add(MakeResult(
-            config,
-            $"Figure caption must have no indentation (left: {left / UnitConversion.TwipsPerCm:F2}cm, first-line: {firstLine / UnitConversion.TwipsPerCm:F2}cm).",
-            paraIndex,
-            preview));
-    }
-
-    private ValidationResult MakeResult(
-        UniversityConfig config,
-        string message,
-        int paragraph,
-        string text)
-    {
-        return ValidationResultFactory.ForParagraph(
-            Name,
-            config,
-            message,
-            paragraph,
-            text,
-            ParagraphIndexKind.Descendant);
-    }
-}
diff --git a/backend/Rules/FontFamilyRule.cs b/backend/Rules/FontFamilyRule.cs
deleted file mode 100644
index 98044d3..0000000
--- a/backend/Rules/FontFamilyRule.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.CodeBlocks;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Formatting;
-using backend.Services.Results;
-
-namespace backend.Rules;
-
-public class FontFamilyValidationRule : IValidationRule
-{
-    private readonly ICodeBlockDetector _codeBlockDetector;
-
-    public string Name => nameof(FontConfig.FontFamily);
-
-    public FontFamilyValidationRule(ICodeBlockDetector? codeBlockDetector = null)
-    {
-        _codeBlockDetector = codeBlockDetector ?? CodeBlockDetector.CreateDefault();
-    }
-
-    public IEnumerable<ValidationResult> Validate(WordprocessingDocument doc, UniversityConfig config)
-    {
-        return Validate(doc, config, null);
-    }
-
-    public IEnumerable<ValidationResult> Validate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? commentService)
-    {
-        var expectedFont = config.Formatting.Font.FontFamily;
-        var errors = new List<ValidationResult>();
-
-        foreach (var (paragraph, paragraphIndex) in DocumentAnalysisScope.BodyParagraphs(doc, config))
-        {
-            if (CodeBlockRuleSkipper.ShouldSkip(doc, paragraph, _codeBlockDetector))
-                continue;
-
-            ValidateParagraph(doc, paragraph, paragraphIndex, expectedFont, config, errors, commentService);
-        }
-
-        return errors;
-    }
-
-    private void ValidateParagraph(
-        WordprocessingDocument doc,
-        Paragraph paragraph,
-        int paragraphIndex,
-        string expectedFont,
-        UniversityConfig config,
-        List<ValidationResult> errors,
-        DocumentCommentService? commentService)
-    {
-        int runIndex = 0;
-        int characterOffset = 0;
-
-        foreach (var run in paragraph.Elements<Run>())
-        {
-            runIndex++;
-            var text = TextExtractionService.GetRunText(run, config);
-
-            if (!string.IsNullOrWhiteSpace(text))
-            {
-                var actualFont = FormattingResolutionService.ResolveFontFamily(doc, paragraph, run);
-
-                if (!string.Equals(actualFont, expectedFont, StringComparison.OrdinalIgnoreCase))
-                {
-                    var message = $"Invalid font '{actualFont ?? "unknown"}' found, expected '{expectedFont}'";
-
-                    commentService?.AddCommentToRun(doc, run, message);
-
-                    errors.Add(ValidationResultFactory.ForRun(
-                        Name,
-                        config,
-                        message,
-                        paragraphIndex,
-                        runIndex,
-                        characterOffset,
-                        text.Length,
-                        TextExtractionService.Truncate(text, 50),
-                        ParagraphIndexKind.BodyElement));
-                }
-            }
-
-            characterOffset += text.Length;
-        }
-    }
-}
diff --git a/backend/Rules/GrammarRule.cs b/backend/Rules/GrammarRule.cs
deleted file mode 100644
index 92d9d6c..0000000
--- a/backend/Rules/GrammarRule.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.CodeBlocks;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Language;
-using backend.Services.Results;
-
-namespace backend.Rules;
-
-/// <summary>
-/// Validates document text for grammar and spelling errors using LanguageTool.
-/// </summary>
-public class GrammarRule : IValidationRule
-{
-    private readonly LanguageToolService _languageToolService;
-    private readonly ICodeBlockDetector _codeBlockDetector;
-
-    public GrammarRule(
-        LanguageToolService languageToolService,
-        ICodeBlockDetector? codeBlockDetector = null)
-    {
-        _languageToolService = languageToolService;
-        _codeBlockDetector = codeBlockDetector ?? CodeBlockDetector.CreateDefault();
-    }
-
-    public string Name => "Grammar";
-
-    public IEnumerable<ValidationResult> Validate(WordprocessingDocument doc, UniversityConfig config)
-    {
-        return Validate(doc, config, null);
-    }
-
-    public IEnumerable<ValidationResult> Validate(WordprocessingDocument doc, UniversityConfig config, DocumentCommentService? commentService)
-    {
-        return ValidateAsync(doc, config, commentService).GetAwaiter().GetResult();
-    }
-
-    private async Task<IEnumerable<ValidationResult>> ValidateAsync(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? commentService)
-    {
-        var errors = new List<ValidationResult>();
-        if (!await _languageToolService.IsAvailableAsync())
-        {
-            errors.Add(ValidationResultFactory.Create(
-                Name,
-                config,
-                "Grammar check skipped: LanguageTool service is not available",
-                new DocumentLocation { Paragraph = 0 },
-                ParagraphIndexKind.BodyElement,
-                ValidationSeverity.Warning));
-            return errors;
-        }
-
-        var language = config.Language;
-
-        foreach (var (paragraph, paragraphIndex) in DocumentAnalysisScope.BodyParagraphs(doc, config))
-        {
-            if (CodeBlockRuleSkipper.ShouldSkip(doc, paragraph, _codeBlockDetector))
-                continue;
-
-            var paragraphText = TextExtractionService.GetParagraphText(doc, paragraph, config);
-            if (string.IsNullOrWhiteSpace(paragraphText))
-                continue;
-
-            var grammarErrors = await CheckParagraphGrammarAsync(
-                doc,
-                paragraph,
-                paragraphText,
-                paragraphIndex,
-                config,
-                language,
-                commentService);
-
-            errors.AddRange(grammarErrors);
-        }
-
-        return errors;
-    }
-
-    private async Task<List<ValidationResult>> CheckParagraphGrammarAsync(
-        WordprocessingDocument doc,
-        Paragraph paragraph,
-        string text,
-        int paragraphIndex,
-        UniversityConfig config,
-        string language,
-        DocumentCommentService? commentService)
-    {
-        var errors = new List<ValidationResult>();
-
-        try
-        {
-            var response = await _languageToolService.CheckTextAsync(text, language);
-
-            foreach (var match in response.Matches)
-            {
-                var result = CreateValidationResult(match, config, paragraphIndex, text);
-                errors.Add(result);
-
-                // Add comment to document
-                if (commentService != null)
-                {
-                    commentService.AddCommentAtOffset(doc, paragraph, match.Offset, match.Length, result.Message);
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            errors.Add(ValidationResultFactory.Create(
-                Name,
-                config,
-                $"Grammar check failed for paragraph {paragraphIndex}: {ex.Message}",
-                new DocumentLocation
-                {
-                    Paragraph = paragraphIndex
-                },
-                ParagraphIndexKind.BodyElement,
-                ValidationSeverity.Warning));
-        }
-
-        return errors;
-    }
-
-    private ValidationResult CreateValidationResult(
-        LanguageToolMatch match,
-        UniversityConfig config,
-        int paragraphIndex,
-        string fullText)
-    {
-        var errorText = fullText.Substring(
-            match.Offset,
-            Math.Min(match.Length, fullText.Length - match.Offset));
-
-        var suggestions = match.Replacements
-            .Take(3)
-            .Select(r => r.Value)
-            .ToList();
-
-        var suggestionText = suggestions.Count > 0
-            ? $" Suggestions: {string.Join(", ", suggestions)}"
-            : string.Empty;
-
-        var issueType = GetIssueType(match);
-
-        var severity = issueType == GrammarIssueType.Spelling || issueType == GrammarIssueType.Grammar
-            ? ValidationSeverity.Error
-            : ValidationSeverity.Warning;
-
-        return ValidationResultFactory.ForRun(
-            Name,
-            config,
-            $"{issueType}: {match.Message}{suggestionText}",
-            paragraphIndex,
-            1,
-            match.Offset,
-            match.Length,
-            TextExtractionService.Truncate(errorText, 50),
-            ParagraphIndexKind.BodyElement,
-            severity);
-    }
-
-    private static GrammarIssueType GetIssueType(LanguageToolMatch match)
-    {
-        var issueType = match.Rule?.IssueType?.ToLowerInvariant() ?? string.Empty;
-        var categoryId = match.Rule?.Category?.Id?.ToLowerInvariant() ?? string.Empty;
-
-        if (issueType == "misspelling" || categoryId == "typos")
-            return GrammarIssueType.Spelling;
-
-        if (categoryId.Contains("grammar") || issueType == "grammar")
-            return GrammarIssueType.Grammar;
-
-        if (categoryId.Contains("style") || issueType == "style")
-            return GrammarIssueType.Style;
-
-        if (categoryId.Contains("punctuation"))
-            return GrammarIssueType.Punctuation;
-
-        if (categoryId.Contains("typography"))
-            return GrammarIssueType.Typography;
-
-        return GrammarIssueType.Other;
-    }
-
-}
-
-public enum GrammarIssueType
-{
-    Spelling,
-    Grammar,
-    Punctuation,
-    Style,
-    Typography,
-    Other
-}
diff --git a/backend/Rules/HeadingStyleUsageRule.cs b/backend/Rules/HeadingStyleUsageRule.cs
deleted file mode 100644
index 0b17023..0000000
--- a/backend/Rules/HeadingStyleUsageRule.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Formatting;
-using backend.Services.Results;
-using backend.Services.Skipping;
-using backend.Services.Structure;
-
-namespace backend.Rules;
-
-/// <summary>
-/// Detects paragraphs that look manually formatted as headings without using a Heading style.
-/// </summary>
-public class HeadingStyleUsageRule : IValidationRule
-{
-    public string Name => "HeadingStyleUsageRule";
-
-    private const int FontSizeThresholdAboveBodyPt = 2;
-    private const int MaxHeadingTextLength = 200;
-
-    public IEnumerable<ValidationResult> Validate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? commentService = null)
-    {
-        var errors = new List<ValidationResult>();
-        var bodyFontSizePt = config.Formatting.Font.FontSize;
-        var thresholdPt = bodyFontSizePt + FontSizeThresholdAboveBodyPt;
-
-        foreach (var (paragraph, paragraphIndex) in DocumentAnalysisScope.BodyParagraphs(doc, config))
-        {
-            if (HeadingDetectionService.IsHeading(doc, paragraph))
-                continue;
-
-            if (SkipDecisionService.HasExcludedStructuralStyle(paragraph))
-                continue;
-
-            var text = TextExtractionService.GetParagraphText(doc, paragraph, config).Trim();
-
-            if (string.IsNullOrWhiteSpace(text) || text.Length > MaxHeadingTextLength)
-                continue;
-
-            if (!LooksLikeManualHeading(doc, paragraph, config, thresholdPt))
-                continue;
-
-            var preview = TextExtractionService.Truncate(text, 60);
-            var message =
-                "Paragraph appears manually formatted as a heading - " +
-                "apply a proper Heading style (Heading 1, Heading 2, etc.) " +
-                "instead of manual bold/font-size formatting.";
-
-            errors.Add(ValidationResultFactory.ForParagraph(
-                Name,
-                config,
-                message,
-                paragraphIndex,
-                preview,
-                ParagraphIndexKind.BodyElement));
-
-            commentService?.AddCommentToParagraph(doc, paragraph, message);
-        }
-
-        return errors;
-    }
-
-    private static bool LooksLikeManualHeading(
-        WordprocessingDocument doc,
-        Paragraph paragraph,
-        UniversityConfig config,
-        double fontSizeThresholdPt)
-    {
-        var runs = paragraph.Elements<Run>()
-            .Where(run => !string.IsNullOrWhiteSpace(TextExtractionService.GetRunText(run, config)))
-            .ToList();
-
-        if (runs.Count == 0)
-            return false;
-
-        bool allBold = true;
-        bool hasLargeFont = false;
-
-        foreach (var run in runs)
-        {
-            if (!FormattingResolutionService.IsRunBold(doc, paragraph, run))
-                allBold = false;
-
-            var fontSizePt = FormattingResolutionService.ResolveFontSizePt(doc, paragraph, run);
-            if (fontSizePt is not null && fontSizePt >= fontSizeThresholdPt)
-                hasLargeFont = true;
-        }
-
-        return allBold && hasLargeFont;
-    }
-}
diff --git a/backend/Rules/HierarchyDepthRule.cs b/backend/Rules/HierarchyDepthRule.cs
deleted file mode 100644
index 3897bb2..0000000
--- a/backend/Rules/HierarchyDepthRule.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Results;
-using backend.Services.Structure;
-
-namespace Rules;
-
-/// <summary>
-/// Hierarchy: The division of the work cannot be deeper than 3 levels.
-/// Any usage of Heading 4, Heading 5, etc. is forbidden.
-/// </summary>
-public class HierarchyDepthRule : IValidationRule
-{
-    private const int MaxAllowedLevel = 3;
-
-    public string Name => "HierarchyDepthRule";
-
-    public IEnumerable<ValidationResult> Validate(WordprocessingDocument doc, UniversityConfig config, DocumentCommentService? documentCommentService = null)
-    {
-        var errors = new List<ValidationResult>();
-        foreach (var (paragraph, paragraphIndex) in DocumentAnalysisScope.DescendantParagraphs(doc, config))
-        {
-            var level = HeadingDetectionService.GetHeadingLevel(doc, paragraph);
-            if (level is null || level <= MaxAllowedLevel)
-                continue;
-
-            var text = TextExtractionService.GetParagraphText(doc, paragraph, config);
-            var preview = TextExtractionService.Truncate(text, 60);
-
-            var errorMessage = $"Structure too deep. Detected Level {level}, but maximum allowed is {MaxAllowedLevel}.";
-
-            errors.Add(ValidationResultFactory.ForParagraph(
-                Name,
-                config,
-                errorMessage,
-                paragraphIndex,
-                preview));
-
-            documentCommentService?.AddCommentToParagraph(doc, paragraph, errorMessage);
-        }
-
-        return errors;
-    }
-}
diff --git a/backend/Rules/IValidationRule.cs b/backend/Rules/IValidationRule.cs
deleted file mode 100644
index d18d206..0000000
--- a/backend/Rules/IValidationRule.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using backend.Services.Comments;
-
-namespace ThesisValidator.Rules;
-
-public interface IValidationRule
-{
-    /// <summary>
-    /// The unique ID of this rule (e.g., "Formatting.Font").
-    /// Matches the config section this rule validates.
-    /// </summary>
-    string Name { get; }
-
-    /// <summary>
-    /// Runs the validation logic.
-    /// </summary>
-    /// <param name="doc">The OpenXML Word document.</param>
-    /// <param name="config">The full configuration object.</param>
-    /// <param name="documentCommentService">Optional comment service to annotate the document.</param>
-    /// <returns>A list of errors (or empty list if valid).</returns>
-    IEnumerable<ValidationResult> Validate(WordprocessingDocument doc, UniversityConfig config, DocumentCommentService? documentCommentService = null);
-}
diff --git a/backend/Rules/LineSpacingDependencyRule.cs b/backend/Rules/LineSpacingDependencyRule.cs
deleted file mode 100644
index ff15f73..0000000
--- a/backend/Rules/LineSpacingDependencyRule.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.CodeBlocks;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Formatting;
-using backend.Services.Results;
-using backend.Services.Skipping;
-using backend.Services.Structure;
-
-namespace Rules;
-
-/// <summary>
-/// Rule #11: If line spacing is 1.5, then paragraph spacing before and after must be 0.
-/// </summary>
-public class LineSpacingDependencyRule : IValidationRule
-{
-    private readonly ICodeBlockDetector _codeBlockDetector;
-
-    private const int LineSpacing15 = 360;
-
-    public string Name => "LineSpacingDependencyRule";
-
-    public LineSpacingDependencyRule(ICodeBlockDetector? codeBlockDetector = null)
-    {
-        _codeBlockDetector = codeBlockDetector ?? CodeBlockDetector.CreateDefault();
-    }
-
-    public IEnumerable<ValidationResult> Validate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? documentCommentService)
-    {
-        var errors = new List<ValidationResult>();
-        foreach (var (paragraph, paragraphIndex) in DocumentAnalysisScope.DescendantParagraphs(doc, config))
-        {
-            if (HeadingDetectionService.IsHeading(doc, paragraph))
-                continue;
-
-            if (SkipDecisionService.HasExcludedStructuralStyle(paragraph))
-                continue;
-
-            if (CodeBlockRuleSkipper.ShouldSkip(doc, paragraph, _codeBlockDetector))
-                continue;
-
-            var (lineSpacing, lineRule) = FormattingResolutionService.ResolveLineSpacing(doc, paragraph);
-            if (!IsLineSpacing15(lineSpacing, lineRule))
-                continue;
-
-            var (spacingBefore, spacingAfter) = FormattingResolutionService.ResolveParagraphSpacing(doc, paragraph);
-
-            if (spacingBefore != 0 || spacingAfter != 0)
-            {
-                var beforePt = UnitConversion.TwipsToPoints(spacingBefore);
-                var afterPt = UnitConversion.TwipsToPoints(spacingAfter);
-                var preview = TextExtractionService.GetPreview(paragraph, config, 50);
-                if (string.IsNullOrWhiteSpace(preview))
-                    continue;
-
-                var errorMessage = $"Paragraph with 1.5 line spacing must have 0pt spacing before and after. " +
-                                   $"Found: Before={beforePt:F1}pt, After={afterPt:F1}pt.";
-
-                errors.Add(ValidationResultFactory.ForParagraph(
-                    Name,
-                    config,
-                    errorMessage,
-                    paragraphIndex,
-                    preview));
-
-                documentCommentService?.AddCommentToParagraph(doc, paragraph, errorMessage);
-            }
-        }
-
-        return errors;
-    }
-
-    private static bool IsLineSpacing15(int? lineSpacing, LineSpacingRuleValues? lineRule)
-    {
-        if (!lineSpacing.HasValue)
-            return false;
-
-        return (lineRule == null || lineRule == LineSpacingRuleValues.Auto)
-            && lineSpacing.Value == LineSpacing15;
-    }
-}
diff --git a/backend/Rules/ListConsistencyRule.cs b/backend/Rules/ListConsistencyRule.cs
deleted file mode 100644
index 5658091..0000000
--- a/backend/Rules/ListConsistencyRule.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Formatting;
-using backend.Services.Results;
-using backend.Services.Skipping;
-using backend.Services.Structure;
-
-namespace Rules;
-
-/// <summary>
-/// Validates list consistency:
-/// 1. Punctuation: Items (except last) should end with same punctuation (; or ,), last item ends with period.
-/// 2. Indentation: All items at the same level should have identical indentation.
-/// </summary>
-public class ListConsistencyRule : IValidationRule
-{
-    public string Name => "ListConsistencyRule";
-
-    public IEnumerable<ValidationResult> Validate(WordprocessingDocument doc, UniversityConfig config, DocumentCommentService? documentCommentService)
-    {
-        var errors = new List<ValidationResult>();
-        var lists = ExtractLists(doc, config);
-
-        foreach (var list in lists)
-        {
-            errors.AddRange(ValidatePunctuationConsistency(doc, list, config, documentCommentService));
-
-            errors.AddRange(ValidateIndentationConsistency(doc, list, config, documentCommentService));
-        }
-
-        return errors;
-    }
-
-    private static List<ListGroup> ExtractLists(WordprocessingDocument doc, UniversityConfig config)
-    {
-        var lists = new List<ListGroup>();
-        ListGroup? currentList = null;
-        int? currentNumberingId = null;
-
-        foreach (var (paragraph, paragraphIndex) in DocumentAnalysisScope.BodyParagraphs(doc, config))
-        {
-            if (HeadingDetectionService.IsHeading(doc, paragraph)
-                || SkipDecisionService.HasExcludedStructuralStyle(doc, paragraph))
-            {
-                currentList = null;
-                currentNumberingId = null;
-                continue;
-            }
-
-            var numberingProps = paragraph.ParagraphProperties?.NumberingProperties;
-            var numberingId = numberingProps?.NumberingId?.Val?.Value;
-
-            if (numberingId.HasValue)
-            {
-                if (currentList == null || currentNumberingId != numberingId)
-                {
-                    currentList = new ListGroup { NumberingId = numberingId.Value };
-                    lists.Add(currentList);
-                    currentNumberingId = numberingId;
-                }
-
-                var level = numberingProps?.NumberingLevelReference?.Val?.Value ?? 0;
-                var indent = FormattingResolutionService.ResolveLeftIndent(paragraph);
-
-                currentList.Items.Add(new ListItem
-                {
-                    Paragraph = paragraph,
-                    ParagraphIndex = paragraphIndex,
-                    Level = level,
-                    IndentLeft = indent
-                });
-            }
-            else
-            {
-                currentList = null;
-                currentNumberingId = null;
-            }
-        }
-
-        return lists;
-    }
-
-    private IEnumerable<ValidationResult> ValidatePunctuationConsistency(
-        WordprocessingDocument doc,
-        ListGroup list,
-        UniversityConfig config,
-        DocumentCommentService? documentCommentService)
-    {
-        var errors = new List<ValidationResult>();
-
-        if (list.Items.Count < 2)
-            return errors;
-
-        var itemsByLevel = list.Items.GroupBy(i => i.Level);
-
-        foreach (var levelGroup in itemsByLevel)
-        {
-            var items = levelGroup.ToList();
-            if (items.Count < 2)
-                continue;
-
-            var firstItem = items.First();
-            var lastItem = items.Last();
-            var middleItems = items.Count > 2 ? items.Skip(1).Take(items.Count - 2).ToList() : [];
-
-            var expectedPunctuation = GetTrailingPunctuation(firstItem.Paragraph, config);
-
-            foreach (var item in middleItems)
-            {
-                var ending = GetTrailingPunctuation(item.Paragraph, config);
-                var text = TextExtractionService.GetParagraphText(doc, item.Paragraph, config);
-                var preview = GetListItemPreview(text);
-
-                if (ending != expectedPunctuation)
-                {
-                    var expectedDesc = expectedPunctuation.HasValue
-                        ? $"'{expectedPunctuation}'"
-                        : "no punctuation";
-                    var actualDesc = ending.HasValue
-                        ? $"'{ending}'"
-                        : "no punctuation";
-
-                    var errorMessage = $"List item ends with {actualDesc} but first item uses {expectedDesc}. Text: \"{preview}\"";
-
-                    errors.Add(ValidationResultFactory.ForParagraph(
-                        Name,
-                        config,
-                        errorMessage,
-                        item.ParagraphIndex,
-                        preview,
-                        ParagraphIndexKind.BodyElement));
-
-                    documentCommentService?.AddCommentToParagraph(doc, item.Paragraph, errorMessage);
-                }
-            }
-
-            var lastEnding = GetTrailingPunctuation(lastItem.Paragraph, config);
-            if (lastEnding != '.')
-            {
-                var lastText = TextExtractionService.GetParagraphText(doc, lastItem.Paragraph, config);
-                var lastPreview = GetListItemPreview(lastText);
-
-                var errorMessage = lastEnding.HasValue
-                    ? $"Last list item should end with period (.), found '{lastEnding}'. Text: \"{lastPreview}\""
-                    : $"Last list item should end with period (.). Text: \"{lastPreview}\"";
-
-                errors.Add(ValidationResultFactory.ForParagraph(
-                    Name,
-                    config,
-                    errorMessage,
-                    lastItem.ParagraphIndex,
-                    lastPreview,
-                    ParagraphIndexKind.BodyElement));
-
-                documentCommentService?.AddCommentToParagraph(doc, lastItem.Paragraph, errorMessage);
-            }
-        }
-
-        return errors;
-    }
-
-    private IEnumerable<ValidationResult> ValidateIndentationConsistency(
-        WordprocessingDocument doc,
-        ListGroup list,
-        UniversityConfig config,
-        DocumentCommentService? documentCommentService)
-    {
-        var errors = new List<ValidationResult>();
-
-        var itemsByLevel = list.Items.GroupBy(i => i.Level);
-
-        foreach (var levelGroup in itemsByLevel)
-        {
-            var items = levelGroup.ToList();
-            if (items.Count < 2)
-                continue;
-
-            var indentCounts = items
-                .GroupBy(i => i.IndentLeft)
-                .OrderByDescending(g => g.Count())
-                .ToList();
-
-            if (indentCounts.Count <= 1)
-                continue;
-
-            var expectedIndent = indentCounts.First().Key;
-
-            foreach (var item in items.Where(i => i.IndentLeft != expectedIndent))
-            {
-                var text = TextExtractionService.GetParagraphText(doc, item.Paragraph, config);
-                var preview = TextExtractionService.Truncate(text, 40);
-
-                var expectedCm = UnitConversion.TwipsToCentimeters(expectedIndent);
-                var actualCm = UnitConversion.TwipsToCentimeters(item.IndentLeft);
-
-                var errorMessage = $"List item has inconsistent indentation ({actualCm:F2} cm). " +
-                                   $"Expected {expectedCm:F2} cm at level {item.Level}. Text: \"{preview}\"";
-
-                errors.Add(ValidationResultFactory.ForParagraph(
-                    Name,
-                    config,
-                    errorMessage,
-                    item.ParagraphIndex,
-                    preview,
-                    ParagraphIndexKind.BodyElement));
-
-                documentCommentService?.AddCommentToParagraph(doc, item.Paragraph, errorMessage);
-            }
-        }
-
-        return errors;
-    }
-
-    private static char? GetTrailingPunctuation(Paragraph paragraph, UniversityConfig config)
-    {
-        var text = TextExtractionService.GetParagraphText(paragraph, config).TrimEnd();
-        if (string.IsNullOrEmpty(text))
-            return null;
-
-        var lastChar = text[^1];
-        return char.IsPunctuation(lastChar) ? lastChar : null;
-    }
-
-    private static string GetListItemPreview(string text)
-    {
-        return string.IsNullOrWhiteSpace(text)
-            ? "[empty]"
-            : TextExtractionService.Truncate(text, 40);
-    }
-
-    private class ListGroup
-    {
-        public int NumberingId { get; set; }
-        public List<ListItem> Items { get; } = [];
-    }
-
-    private class ListItem
-    {
-        public required Paragraph Paragraph { get; init; }
-        public int ParagraphIndex { get; init; }
-        public int Level { get; init; }
-        public int IndentLeft { get; init; }
-    }
-}
diff --git a/backend/Rules/MissingFigureCaptionRule.cs b/backend/Rules/MissingFigureCaptionRule.cs
deleted file mode 100644
index 78ad44a..0000000
--- a/backend/Rules/MissingFigureCaptionRule.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using backend.Models;
-using backend.Services.Comments;
-using backend.Services.Results;
-using backend.Services.Structure;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using ThesisValidator.Rules;
-
-namespace backend.Rules;
-
-/// <summary>
-/// Detects figure-like objects that do not have a nearby figure caption.
-/// </summary>
-public class MissingFigureCaptionRule : IValidationRule
-{
-    public string Name => "MissingFigureCaptionRule";
-
-    public IEnumerable<ValidationResult> Validate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? commentService = null)
-    {
-        var errors = new List<ValidationResult>();
-
-        foreach (var association in FigureCaptionDetector.AssociateFiguresWithCaptions(
-                     doc,
-                     config,
-                     requireStructuredCaption: true))
-        {
-            if (association.HasCaption)
-                continue;
-
-            var message = "Figure has no caption - add a figure caption below the figure.";
-            errors.Add(ValidationResultFactory.ForParagraph(
-                Name,
-                config,
-                message,
-                association.Figure.ParagraphIndex,
-                "[Figure]",
-                ParagraphIndexKind.Descendant));
-
-            commentService?.AddCommentToParagraph(doc, association.Figure.Paragraph, message);
-        }
-
-        return errors;
-    }
-}
diff --git a/backend/Rules/NoDotsInTitlesRule.cs b/backend/Rules/NoDotsInTitlesRule.cs
deleted file mode 100644
index 6e3121e..0000000
--- a/backend/Rules/NoDotsInTitlesRule.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Formatting;
-using backend.Services.Results;
-
-namespace Rules;
-
-/// <summary>
-/// Titles, Headings, and Captions must NOT end with a period.
-/// Ellipsis (...) and other punctuation (?!) are allowed.
-/// </summary>
-public class NoDotsInTitlesRule : IValidationRule
-{
-    public string Name => "NoDotsInTitlesRule";
-
-    // Style patterns that this rule applies to (case-insensitive)
-    private static readonly string[] TargetStylePatterns =
-    [
-        "heading", "nagwek",           // Headings (EN/PL)
-        "title", "tytu",               // Title (EN/PL)
-        "subtitle", "podtytu",         // Subtitle (EN/PL)
-        "caption", "podpis"            // Caption (EN/PL)
-    ];
-
-    public IEnumerable<ValidationResult> Validate(WordprocessingDocument doc, UniversityConfig config, DocumentCommentService? documentCommentService)
-    {
-        var errors = new List<ValidationResult>();
-        foreach (var (paragraph, paragraphIndex) in DocumentAnalysisScope.DescendantParagraphs(doc, config))
-        {
-            if (!HasTargetStyle(paragraph))
-                continue;
-
-            var text = TextExtractionService.GetParagraphText(doc, paragraph, config);
-
-            if (string.IsNullOrWhiteSpace(text))
-                continue;
-
-            var trimmedText = text.TrimEnd();
-
-            // Check if ends with a single period (not ellipsis)
-            if (EndsWithSinglePeriod(trimmedText))
-            {
-                var styleId = StyleResolutionService.GetParagraphStyleId(paragraph) ?? "Unknown";
-                var preview = TextExtractionService.Truncate(trimmedText, 60);
-
-                var errorMessage = $"Title/Heading should not end with a period. Style: {styleId}. Text: \"{preview}\"";
-
-                errors.Add(ValidationResultFactory.ForParagraph(
-                    Name,
-                    config,
-                    errorMessage,
-                    paragraphIndex,
-                    preview));
-
-                documentCommentService?.AddCommentToParagraph(doc, paragraph, errorMessage);
-            }
-        }
-
-        return errors;
-    }
-
-    private static bool HasTargetStyle(Paragraph paragraph)
-    {
-        var styleId = StyleResolutionService.GetParagraphStyleId(paragraph);
-        if (string.IsNullOrEmpty(styleId))
-            return false;
-
-        var styleLower = styleId.ToLowerInvariant();
-        return TargetStylePatterns.Any(pattern => styleLower.Contains(pattern));
-    }
-
-    private static bool EndsWithSinglePeriod(string text)
-    {
-        if (string.IsNullOrEmpty(text))
-            return false;
-
-        // Must end with a period
-        if (!text.EndsWith('.'))
-            return false;
-
-        // Check it's not an ellipsis (... or more dots)
-        if (text.Length >= 2 && text[^2] == '.')
-            return false;
-
-        // It's a single trailing period - this is an error
-        return true;
-    }
-
-}
diff --git a/backend/Rules/ParagraphIndentRule.cs b/backend/Rules/ParagraphIndentRule.cs
deleted file mode 100644
index 7d8e828..0000000
--- a/backend/Rules/ParagraphIndentRule.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.CodeBlocks;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Formatting;
-using backend.Services.Results;
-using backend.Services.Skipping;
-using backend.Services.Structure;
-
-namespace backend.Rules;
-
-public class ParagraphIndentRule : IValidationRule
-{
-    private readonly ICodeBlockDetector _codeBlockDetector;
-
-    public string Name => nameof(LayoutConfig.RequiredIndentCm);
-
-    private const int ToleranceTwips = 60;
-
-    public ParagraphIndentRule(ICodeBlockDetector? codeBlockDetector = null)
-    {
-        _codeBlockDetector = codeBlockDetector ?? CodeBlockDetector.CreateDefault();
-    }
-
-    public IEnumerable<ValidationResult> Validate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? documentCommentService = null)
-    {
-        var errors = new List<ValidationResult>();
-        var allowedIndentsTwips = new[] { 567, 709 };
-
-        foreach (var (paragraph, paragraphIndex) in DocumentAnalysisScope.DescendantParagraphs(doc, config))
-        {
-            if (HeadingDetectionService.IsHeading(doc, paragraph))
-                continue;
-
-            if (SkipDecisionService.HasExcludedStructuralStyle(doc, paragraph))
-                continue;
-
-            if (CodeBlockRuleSkipper.ShouldSkip(doc, paragraph, _codeBlockDetector))
-                continue;
-
-            if (!TextExtractionService.HasMeaningfulParagraphContent(paragraph, config))
-                continue;
-
-            if (IsCenteredOrRightAligned(doc, paragraph))
-                continue;
-
-            var firstLineIndent = FormattingResolutionService.ResolveFirstLineIndent(doc, paragraph);
-            var startsWithTab = StartsWithTabCharacter(paragraph);
-
-            if (firstLineIndent == 0 && SkipDecisionService.IsListItem(paragraph))
-                continue;
-
-            if (startsWithTab && firstLineIndent == 0)
-            {
-                var message = "Paragraph uses TAB character for indent instead of proper first-line indent formatting. Please use paragraph formatting (1.00 cm or 1.25 cm first-line indent) instead of TAB.";
-
-                errors.Add(ValidationResultFactory.ForParagraph(
-                    Name,
-                    config,
-                    message,
-                    paragraphIndex,
-                    TextExtractionService.GetPreview(paragraph, config, 50)));
-
-                documentCommentService?.AddCommentToParagraph(doc, paragraph, message);
-                continue;
-            }
-
-            if (!IsValidIndent(firstLineIndent, allowedIndentsTwips))
-            {
-                var actualIndentCm = firstLineIndent / UnitConversion.TwipsPerCm;
-                var message = $"Paragraph has incorrect first line indent: {actualIndentCm:F2} cm. Expected 1.00 cm or 1.25 cm.";
-
-                errors.Add(ValidationResultFactory.ForParagraph(
-                    Name,
-                    config,
-                    message,
-                    paragraphIndex,
-                    TextExtractionService.GetPreview(paragraph, config, 50)));
-
-                documentCommentService?.AddCommentToParagraph(doc, paragraph, message);
-            }
-        }
-
-        return errors;
-    }
-
-    private static bool IsValidIndent(int actualTwips, int[] allowedTwips)
-    {
-        return allowedTwips.Any(allowed => Math.Abs(actualTwips - allowed) <= ToleranceTwips);
-    }
-
-    private static bool StartsWithTabCharacter(Paragraph paragraph)
-    {
-        var firstRun = paragraph.Elements<Run>().FirstOrDefault();
-        if (firstRun == null)
-            return false;
-
-        var firstChild = firstRun.Elements().FirstOrDefault();
-        if (firstChild is TabChar)
-            return true;
-
-        foreach (var child in firstRun.Elements())
-        {
-            if (child is TabChar)
-                return true;
-            if (child is Text)
-                break;
-        }
-
-        return false;
-    }
-
-    private static bool IsCenteredOrRightAligned(WordprocessingDocument doc, Paragraph paragraph)
-    {
-        var justification = FormattingResolutionService.ResolveJustification(doc, paragraph);
-        return justification == JustificationValues.Center || justification == JustificationValues.Right;
-    }
-}
diff --git a/backend/Rules/ParagraphSpacingRule.cs b/backend/Rules/ParagraphSpacingRule.cs
deleted file mode 100644
index d2decdc..0000000
--- a/backend/Rules/ParagraphSpacingRule.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.CodeBlocks;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Formatting;
-using backend.Services.Results;
-using backend.Services.Skipping;
-using backend.Services.Structure;
-
-namespace Rules;
-
-public class ParagraphSpacingRule : IValidationRule
-{
-    private readonly ICodeBlockDetector _codeBlockDetector;
-
-    public string Name => nameof(LayoutConfig.ParagraphSpacingRule);
-
-    public ParagraphSpacingRule(ICodeBlockDetector? codeBlockDetector = null)
-    {
-        _codeBlockDetector = codeBlockDetector ?? CodeBlockDetector.CreateDefault();
-    }
-
-    public IEnumerable<ValidationResult> Validate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? documentCommentService)
-    {
-        var errors = new List<ValidationResult>();
-        var allowedSpacingTwips = config.Formatting.Layout.ParagraphSpacingRule
-            .Select(UnitConversion.PointsToTwips)
-            .ToHashSet();
-
-        foreach (var (paragraph, paragraphIndex) in DocumentAnalysisScope.DescendantParagraphs(doc, config))
-        {
-            if (HeadingDetectionService.IsHeading(doc, paragraph))
-                continue;
-
-            if (SkipDecisionService.HasExcludedStructuralStyle(paragraph))
-                continue;
-
-            if (CodeBlockRuleSkipper.ShouldSkip(doc, paragraph, _codeBlockDetector))
-                continue;
-
-            var spacingAfter = FormattingResolutionService.ResolveSpacingAfter(doc, paragraph);
-            var preview = TextExtractionService.GetPreview(paragraph, config, 50);
-
-            if (!allowedSpacingTwips.Contains(spacingAfter)
-                && !string.IsNullOrWhiteSpace(preview))
-            {
-                var expectedPts = string.Join(" or ", config.Formatting.Layout.ParagraphSpacingRule.Select(pt => $"{pt}pt"));
-                var actualPt = UnitConversion.TwipsToPoints(spacingAfter);
-                var errorMessage = $"Paragraph has incorrect spacing. After value: {actualPt:F1}pt ({spacingAfter} twips). Expected {expectedPts}.";
-
-                errors.Add(ValidationResultFactory.ForParagraph(
-                    Name,
-                    config,
-                    errorMessage,
-                    paragraphIndex,
-                    preview));
-
-                documentCommentService?.AddCommentToParagraph(doc, paragraph, errorMessage);
-            }
-        }
-
-        return errors;
-    }
-}
diff --git a/backend/Rules/RuleDefinition.cs b/backend/Rules/RuleDefinition.cs
deleted file mode 100644
index e429cea..0000000
--- a/backend/Rules/RuleDefinition.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using backend.Models;
-
-namespace ThesisValidator.Rules;
-
-public static class RuleCategories
-{
-    public const string Formatting = "Formatting";
-    public const string Layout = "Layout";
-    public const string Structure = "Structure";
-    public const string Language = "Language";
-}
-
-public sealed record RuleDefinition(
-    string Id,
-    string DisplayName,
-    string Category,
-    string DefaultSeverity,
-    bool Enabled = true,
-    bool Selectable = true);
-
-public static class RuleCatalog
-{
-    private static readonly IReadOnlyDictionary<string, RuleDefinition> Definitions =
-        new Dictionary<string, RuleDefinition>(StringComparer.OrdinalIgnoreCase)
-        {
-            ["FontFamily"] = new(
-                "FontFamily",
-                "Font Family",
-                RuleCategories.Formatting,
-                ValidationSeverity.Error),
-            ["SingleSpaceRule"] = new(
-                "SingleSpaceRule",
-                "Single Space",
-                RuleCategories.Formatting,
-                ValidationSeverity.Error),
-            ["TextJustificationRule"] = new(
-                "TextJustificationRule",
-                "Text Justification",
-                RuleCategories.Formatting,
-                ValidationSeverity.Error),
-            ["NoDotsInTitlesRule"] = new(
-                "NoDotsInTitlesRule",
-                "Title Punctuation",
-                RuleCategories.Formatting,
-                ValidationSeverity.Error),
-            ["ListConsistencyRule"] = new(
-                "ListConsistencyRule",
-                "List Consistency",
-                RuleCategories.Layout,
-                ValidationSeverity.Error),
-            ["ParagraphSpacingRule"] = new(
-                "ParagraphSpacingRule",
-                "Paragraph Spacing",
-                RuleCategories.Layout,
-                ValidationSeverity.Error),
-            ["RequiredIndentCm"] = new(
-                "RequiredIndentCm",
-                "Paragraph Indent",
-                RuleCategories.Layout,
-                ValidationSeverity.Error),
-            ["LineSpacingDependencyRule"] = new(
-                "LineSpacingDependencyRule",
-                "Line Spacing",
-                RuleCategories.Layout,
-                ValidationSeverity.Error),
-            ["HeadingStyleUsageRule"] = new(
-                "HeadingStyleUsageRule",
-                "Heading Style Usage",
-                RuleCategories.Structure,
-                ValidationSeverity.Error),
-            ["HierarchyDepthRule"] = new(
-                "HierarchyDepthRule",
-                "Heading Hierarchy",
-                RuleCategories.Structure,
-                ValidationSeverity.Error),
-            ["MissingFigureCaptionRule"] = new(
-                "MissingFigureCaptionRule",
-                "Missing Figure Captions",
-                RuleCategories.Structure,
-                ValidationSeverity.Error),
-            ["FigureCaptionPositionRule"] = new(
-                "FigureCaptionPositionRule",
-                "Figure Caption Position",
-                RuleCategories.Structure,
-                ValidationSeverity.Error),
-            ["FigureCaptionStyleRule"] = new(
-                "FigureCaptionStyleRule",
-                "Figure Caption Style",
-                RuleCategories.Structure,
-                ValidationSeverity.Error),
-            ["FigureCaptionFormatRule"] = new(
-                "FigureCaptionFormatRule",
-                "Figure Caption Format",
-                RuleCategories.Structure,
-                ValidationSeverity.Error),
-            ["FigureCaptionAutomaticNumberingRule"] = new(
-                "FigureCaptionAutomaticNumberingRule",
-                "Figure Caption Automatic Numbering",
-                RuleCategories.Structure,
-                ValidationSeverity.Warning),
-            ["CheckTableOfContents"] = new(
-                "CheckTableOfContents",
-                "Table of Contents",
-                RuleCategories.Structure,
-                ValidationSeverity.Error),
-            ["Manual table of contents"] = new(
-                "Manual table of contents",
-                "Manual table of contents",
-                RuleCategories.Structure,
-                ValidationSeverity.Warning,
-                Selectable: false),
-            ["EmptySectionStructureRule"] = new(
-                "EmptySectionStructureRule",
-                "Empty Sections",
-                RuleCategories.Language,
-                ValidationSeverity.Error),
-            ["Grammar"] = new(
-                "Grammar",
-                "Grammar & Spelling",
-                RuleCategories.Language,
-                ValidationSeverity.Error)
-        };
-
-    public static RuleDefinition GetDefinition(string ruleId)
-    {
-        return Definitions.TryGetValue(ruleId, out var definition)
-            ? definition
-            : new RuleDefinition(
-                ruleId,
-                ruleId,
-                RuleCategories.Formatting,
-                ValidationSeverity.Error);
-    }
-}
diff --git a/backend/Rules/SingleSpaceRule.cs b/backend/Rules/SingleSpaceRule.cs
deleted file mode 100644
index 6819f2b..0000000
--- a/backend/Rules/SingleSpaceRule.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System.Text.RegularExpressions;
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.CodeBlocks;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Results;
-
-namespace Rules;
-
-/// <summary>
-/// Rule #13: Only single spaces allowed between words.
-/// (Polish: Odstęp między wyrazami jedna spacja)
-/// </summary>
-public partial class SingleSpaceRule : IValidationRule
-{
-    private readonly ICodeBlockDetector _codeBlockDetector;
-
-    public string Name => "SingleSpaceRule";
-
-    public SingleSpaceRule(ICodeBlockDetector? codeBlockDetector = null)
-    {
-        _codeBlockDetector = codeBlockDetector ?? CodeBlockDetector.CreateDefault();
-    }
-
-    // Regex to find 2 or more consecutive spaces
-    [GeneratedRegex(@"  +", RegexOptions.Compiled)]
-    private static partial Regex MultipleSpacesRegex();
-
-    public IEnumerable<ValidationResult> Validate(WordprocessingDocument doc, UniversityConfig config, DocumentCommentService? documentCommentService)
-    {
-        var errors = new List<ValidationResult>();
-        foreach (var (paragraph, paragraphIndex) in DocumentAnalysisScope.DescendantParagraphs(doc, config))
-        {
-            if (CodeBlockRuleSkipper.ShouldSkip(doc, paragraph, _codeBlockDetector))
-                continue;
-
-            var text = TextExtractionService.GetParagraphText(doc, paragraph, config);
-
-            if (string.IsNullOrWhiteSpace(text))
-                continue;
-
-            var matches = MultipleSpacesRegex().Matches(text);
-
-            foreach (Match match in matches)
-            {
-                var snippet = GetContextSnippet(text, match.Index, match.Length);
-                var spaceCount = match.Length;
-
-                var errorMessage = $"Multiple spaces found ({spaceCount} spaces). Only single spaces allowed between words. Context: \"{snippet}\"";
-
-                errors.Add(ValidationResultFactory.Create(
-                    Name,
-                    config,
-                    errorMessage,
-                    new DocumentLocation
-                    {
-                        Paragraph = paragraphIndex,
-                        CharacterOffset = match.Index,
-                        Length = match.Length,
-                        Text = snippet
-                    }));
-
-                documentCommentService?.AddCommentToParagraph(doc, paragraph, errorMessage);
-            }
-        }
-
-        return errors;
-    }
-
-    private static string GetContextSnippet(string text, int matchIndex, int matchLength, int contextChars = 15)
-    {
-        var start = Math.Max(0, matchIndex - contextChars);
-        var end = Math.Min(text.Length, matchIndex + matchLength + contextChars);
-
-        var snippet = text[start..end];
-
-        var prefix = start > 0 ? "..." : "";
-        var suffix = end < text.Length ? "..." : "";
-
-        var beforeMatch = snippet[..(matchIndex - start)];
-        var theMatch = snippet[(matchIndex - start)..(matchIndex - start + matchLength)];
-        var afterMatch = snippet[(matchIndex - start + matchLength)..];
-
-        return $"{prefix}{beforeMatch}[{matchLength} spaces]{afterMatch}{suffix}";
-    }
-}
diff --git a/backend/Rules/TOCRule.cs b/backend/Rules/TOCRule.cs
deleted file mode 100644
index 41b7018..0000000
--- a/backend/Rules/TOCRule.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Results;
-using backend.Services.Structure;
-
-namespace Rules;
-
-public class TocRule : IValidationRule
-{
-    public const string ManualTableOfContentsRuleName = "Manual table of contents";
-
-    private const string ManualTableOfContentsMessage =
-        "A table of contents section was detected, but no automatic Word TOC field was found. The table of contents was probably created manually and may become inconsistent with the document structure.";
-
-    public string Name => nameof(FormattingConfig.CheckTableOfContents);
-
-    public IEnumerable<ValidationResult> Validate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? documentCommentService = null)
-    {
-        var errors = new List<ValidationResult>();
-        var detection = DetectTableOfContents(doc);
-
-        if (detection.Kind == TableOfContentsKind.Automatic)
-            return errors;
-
-        if (detection.Kind == TableOfContentsKind.Manual)
-        {
-            errors.Add(ValidationResultFactory.ForParagraph(
-                ManualTableOfContentsRuleName,
-                config,
-                ManualTableOfContentsMessage,
-                detection.ParagraphIndex,
-                TextExtractionService.Truncate(detection.Text ?? string.Empty, 80),
-                severity: ValidationSeverity.Warning));
-
-            if (detection.Paragraph is not null && documentCommentService is not null)
-                documentCommentService.AddCommentToParagraph(doc, detection.Paragraph, ManualTableOfContentsMessage);
-
-            return errors;
-        }
-
-        var body = doc.MainDocumentPart?.Document.Body;
-        var firstRun = body?.Descendants<Run>().FirstOrDefault();
-        errors.Add(ValidationResultFactory.Create(
-            Name,
-            config,
-            "Document is missing a Table of Contents."));
-
-        if (firstRun != null && documentCommentService != null)
-            documentCommentService.AddCommentToRun(doc, firstRun, "Document is missing a Table of Contents");
-
-        return errors;
-    }
-
-    public static TableOfContentsDetection DetectTableOfContents(WordprocessingDocument doc)
-    {
-        return TableOfContentsDetectionService.Detect(doc);
-    }
-
-    public static bool IsTableOfContentsHeadingText(string text)
-    {
-        return TableOfContentsDetectionService.IsTableOfContentsHeadingText(text);
-    }
-}
diff --git a/backend/Rules/TextJustificationRule.cs b/backend/Rules/TextJustificationRule.cs
deleted file mode 100644
index b23c1bd..0000000
--- a/backend/Rules/TextJustificationRule.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.CodeBlocks;
-using backend.Services.Comments;
-using backend.Services.Extraction;
-using backend.Services.Formatting;
-using backend.Services.Results;
-using backend.Services.Skipping;
-
-namespace Rules;
-
-/// <summary>
-/// Rule #15: Standard text must use full justification (both margins).
-/// Exceptions: Lists, Headings, Titles, Subtitles, Captions, and TOC entries.
-/// </summary>
-public class TextJustificationRule : IValidationRule
-{
-    private readonly ICodeBlockDetector _codeBlockDetector;
-
-    public string Name => "TextJustificationRule";
-
-    public TextJustificationRule(ICodeBlockDetector? codeBlockDetector = null)
-    {
-        _codeBlockDetector = codeBlockDetector ?? CodeBlockDetector.CreateDefault();
-    }
-
-    public IEnumerable<ValidationResult> Validate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        DocumentCommentService? documentCommentService)
-    {
-        var errors = new List<ValidationResult>();
-        foreach (var (paragraph, paragraphIndex) in DocumentAnalysisScope.DescendantParagraphs(doc, config))
-        {
-            var text = TextExtractionService.GetParagraphText(doc, paragraph, config);
-            if (!TextExtractionService.HasMeaningfulContent(text))
-                continue;
-
-            if (SkipDecisionService.IsListItem(paragraph))
-                continue;
-
-            if (SkipDecisionService.HasExcludedStructuralStyle(paragraph))
-                continue;
-
-            if (CodeBlockRuleSkipper.ShouldSkip(doc, paragraph, _codeBlockDetector))
-                continue;
-
-            var justification = FormattingResolutionService.ResolveJustification(doc, paragraph);
-
-            if (justification != JustificationValues.Both)
-            {
-                var alignmentName = GetAlignmentName(justification);
-                var preview = TextExtractionService.Truncate(text, 50);
-                var errorMessage = $"Paragraph is {alignmentName} aligned. Standard text must use full justification (both margins).";
-
-                errors.Add(ValidationResultFactory.ForParagraph(
-                    Name,
-                    config,
-                    errorMessage,
-                    paragraphIndex,
-                    preview));
-
-                documentCommentService?.AddCommentToParagraph(doc, paragraph, errorMessage);
-            }
-        }
-
-        return errors;
-    }
-
-    private static string GetAlignmentName(JustificationValues? justification)
-    {
-        if (justification == JustificationValues.Left)
-            return "left";
-        if (justification == JustificationValues.Right)
-            return "right";
-        if (justification == JustificationValues.Center)
-            return "center";
-        if (justification == JustificationValues.Both)
-            return "fully justified";
-        if (justification == JustificationValues.Distribute)
-            return "distributed";
-        return "left";
-    }
-}
diff --git a/backend/Services/Analysis/DocumentAnalysisScope.cs b/backend/Services/Analysis/DocumentAnalysisScope.cs
deleted file mode 100644
index 92f3071..0000000
--- a/backend/Services/Analysis/DocumentAnalysisScope.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using Backend.Models;
-using backend.Services.Extraction;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using backend.Services.Skipping;
-
-namespace backend.Services.Analysis;
-
-public enum DocumentBlockType
-{
-    BodyParagraph,
-    TextBox,
-    TableOfContents
-}
-
-public static class DocumentAnalysisScope
-{
-    public static IEnumerable<(Paragraph Paragraph, int Index)> BodyParagraphs(
-        WordprocessingDocument doc,
-        UniversityConfig config)
-    {
-        var body = doc.MainDocumentPart?.Document.Body;
-        if (body is null)
-            yield break;
-
-        var firstIncludedIndex = TableOfContentsSkipRule.GetFirstIncludedBodyParagraphIndex(doc, config);
-        var tocParagraphs = TableOfContentsSkipRule.GetSkippedParagraphs(doc, config);
-        int paragraphIndex = 0;
-
-        foreach (var paragraph in body.Elements<Paragraph>())
-        {
-            paragraphIndex++;
-            var skipDecision = SkipDecisionService.ShouldSkipParagraph(
-                doc,
-                paragraph,
-                config,
-                new SkipContext(paragraphIndex, firstIncludedIndex, tocParagraphs));
-            if (skipDecision.ShouldSkip)
-                continue;
-
-            yield return (paragraph, paragraphIndex);
-        }
-    }
-
-    public static IEnumerable<(Paragraph Paragraph, int Index)> DescendantParagraphs(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        bool includeTableOfContentsContent = false)
-    {
-        var body = doc.MainDocumentPart?.Document.Body;
-        if (body is null)
-            yield break;
-
-        var firstIncludedIndex = TableOfContentsSkipRule.GetFirstIncludedDescendantParagraphIndex(doc, config);
-        var tocParagraphs = includeTableOfContentsContent
-            ? new HashSet<Paragraph>()
-            : TableOfContentsSkipRule.GetSkippedParagraphs(doc, config);
-        int paragraphIndex = 0;
-
-        foreach (var paragraph in body.Descendants<Paragraph>())
-        {
-            paragraphIndex++;
-            var skipDecision = SkipDecisionService.ShouldSkipParagraph(
-                doc,
-                paragraph,
-                config,
-                new SkipContext(paragraphIndex, firstIncludedIndex, tocParagraphs));
-            if (skipDecision.ShouldSkip)
-                continue;
-
-            yield return (paragraph, paragraphIndex);
-        }
-    }
-
-    public static DocumentBlockType GetBlockType(Paragraph paragraph)
-    {
-        if (TableOfContentsSkipRule.IsTableOfContentsParagraph(paragraph))
-            return DocumentBlockType.TableOfContents;
-
-        if (TextBoxSkipRule.IsInsideTextBoxOrDrawingText(paragraph)
-            || TextBoxSkipRule.ContainsTextBoxContent(paragraph))
-        {
-            return DocumentBlockType.TextBox;
-        }
-
-        return DocumentBlockType.BodyParagraph;
-    }
-
-    public static string GetParagraphText(Paragraph paragraph, UniversityConfig config)
-    {
-        return TextExtractionService.GetParagraphText(paragraph, config);
-    }
-
-    public static bool HasMeaningfulParagraphContent(Paragraph paragraph, UniversityConfig config)
-    {
-        return TextExtractionService.HasMeaningfulParagraphContent(paragraph, config);
-    }
-
-    public static bool HasMeaningfulContent(string? text)
-    {
-        return TextExtractionService.HasMeaningfulContent(text);
-    }
-
-    public static string GetRunText(Run run, UniversityConfig config)
-    {
-        return TextExtractionService.GetRunText(run, config);
-    }
-
-    public static bool ContainsTextBoxContent(OpenXmlElement element)
-    {
-        return TextBoxSkipRule.ContainsTextBoxContent(element);
-    }
-
-    public static bool IsTableOfContentsParagraph(Paragraph paragraph)
-    {
-        return TableOfContentsSkipRule.IsTableOfContentsParagraph(paragraph);
-    }
-
-    public static int GetFirstIncludedBodyChildIndex(
-        WordprocessingDocument doc,
-        UniversityConfig config)
-    {
-        return TableOfContentsSkipRule.GetFirstIncludedBodyChildIndex(doc, config);
-    }
-}
diff --git a/backend/Services/Analysis/ThesisValidatorService.cs b/backend/Services/Analysis/ThesisValidatorService.cs
deleted file mode 100644
index 6bb9800..0000000
--- a/backend/Services/Analysis/ThesisValidatorService.cs
+++ /dev/null
@@ -1,270 +0,0 @@
-using backend.Models;
-using backend.Services.Comments;
-using backend.Services.Exceptions;
-using backend.Services.Extraction;
-using backend.Services.Skipping;
-using backend.Services.Structure;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using ThesisValidator.Rules;
-
-namespace backend.Services.Analysis;
-
-public class ThesisValidatorService
-{
-    private readonly IReadOnlyList<IValidationRule> _ruleList;
-    private readonly IReadOnlySet<string> _ruleNames;
-
-    public ThesisValidatorService(IEnumerable<IValidationRule> rules)
-    {
-        _ruleList = rules.ToList();
-        _ruleNames = _ruleList.Select(rule => rule.Name).ToHashSet(StringComparer.OrdinalIgnoreCase);
-    }
-
-    public IReadOnlyList<string> GetAvailableRuleNames()
-    {
-        return _ruleList.Select(rule => rule.Name).ToList();
-    }
-
-    public IReadOnlyList<RuleDefinition> GetAvailableRules()
-    {
-        return _ruleList
-            .Select(rule => RuleCatalog.GetDefinition(rule.Name))
-            .ToList();
-    }
-
-    public IReadOnlyList<string> GetUnknownRuleNames(IEnumerable<string> selectedRules)
-    {
-        return selectedRules
-            .Where(ruleName => !_ruleNames.Contains(ruleName))
-            .Distinct(StringComparer.OrdinalIgnoreCase)
-            .ToList();
-    }
-
-    public (IEnumerable<ValidationResult> Results, List<HeadingInfo> Headings) Validate(Stream fileStream, UniversityConfig config, IEnumerable<string>? selectedRules = null)
-    {
-        using var doc = OpenDocument(fileStream, isEditable: false);
-        var rulesToRun = FilterRules(config, selectedRules);
-
-        var errors = new List<ValidationResult>();
-        foreach (var rule in rulesToRun)
-        {
-            errors.AddRange(rule.Validate(doc, config));
-        }
-
-        var headings = ExtractHeadings(doc, config);
-        var (elementsMap, descendantsMap) = BuildSectionMaps(doc, config);
-        PopulateSectionContext(errors, elementsMap, descendantsMap);
-
-        return (errors, headings);
-    }
-
-    public static List<HeadingInfo> ExtractHeadings(WordprocessingDocument doc, UniversityConfig? config = null)
-    {
-        var headings = new List<HeadingInfo>();
-        var effectiveConfig = config ?? new UniversityConfig();
-        var body = doc.MainDocumentPart?.Document.Body;
-        if (body is null)
-            return headings;
-
-        var tocParagraphIndex = SkipDecisionService.ShouldSkipBeforeTableOfContents(effectiveConfig)
-            ? TableOfContentsDetectionService.Detect(doc).ParagraphIndex
-            : 0;
-
-        int paragraphIndex = 0;
-        foreach (var paragraph in body.Descendants<Paragraph>())
-        {
-            paragraphIndex++;
-            var text = TextExtractionService.GetParagraphText(paragraph, effectiveConfig).Trim();
-            if (string.IsNullOrWhiteSpace(text))
-                continue;
-
-            if (TableOfContentsDetectionService.IsTableOfContentsHeadingText(text))
-            {
-                headings.Add(new HeadingInfo { Level = 1, Text = text });
-                continue;
-            }
-
-            if (tocParagraphIndex > 0 && paragraphIndex <= tocParagraphIndex)
-                continue;
-
-            var level = HeadingDetectionService.GetHeadingLevel(doc, paragraph);
-            if (level is null) continue;
-
-            headings.Add(new HeadingInfo { Level = level.Value, Text = text });
-        }
-
-        return headings;
-    }
-
-    /// <summary>
-    /// Validates the document and adds comments for each error found.
-    /// Returns both the validation results and a stream containing the annotated document.
-    /// </summary>
-    public (IEnumerable<ValidationResult> Results, MemoryStream AnnotatedDocument)
-    ValidateWithComments(Stream fileStream, UniversityConfig config, IEnumerable<string>? selectedRules = null)
-    {
-        using var memoryStream = new MemoryStream();
-        fileStream.CopyTo(memoryStream);
-        memoryStream.Position = 0;
-
-        using var doc = OpenDocument(memoryStream, isEditable: true);
-        var commentService = new DocumentCommentService();
-        var rulesToRun = FilterRules(config, selectedRules);
-
-        var errors = new List<ValidationResult>();
-        foreach (var rule in rulesToRun)
-        {
-            errors.AddRange(rule.Validate(doc, config, commentService));
-        }
-
-        try
-        {
-            doc.MainDocumentPart?.Document.Save();
-            var annotatedStream = DocumentCommentService.SaveDocumentWithComments(doc);
-
-            return (errors, annotatedStream);
-        }
-        catch (Exception ex) when (IsDocumentProcessingException(ex))
-        {
-            throw new InvalidThesisDocumentException("The uploaded file could not be saved as an annotated DOCX document.", ex);
-        }
-    }
-
-    private static WordprocessingDocument OpenDocument(Stream stream, bool isEditable)
-    {
-        try
-        {
-            var doc = WordprocessingDocument.Open(stream, isEditable);
-            if (doc.MainDocumentPart?.Document is not null)
-            {
-                return doc;
-            }
-
-            doc.Dispose();
-            throw new InvalidThesisDocumentException("The uploaded file is not a valid Wordprocessing document.");
-        }
-        catch (InvalidThesisDocumentException)
-        {
-            throw;
-        }
-        catch (Exception ex) when (IsDocumentProcessingException(ex))
-        {
-            throw new InvalidThesisDocumentException("The uploaded file could not be opened as a DOCX document.", ex);
-        }
-    }
-
-    private static bool IsDocumentProcessingException(Exception exception)
-    {
-        return exception is OpenXmlPackageException
-            or FileFormatException
-            or InvalidDataException
-            or IOException
-            or NotSupportedException
-            or InvalidOperationException
-            or ArgumentException
-            or ObjectDisposedException;
-    }
-
-    /// <summary>
-    /// Builds two sorted heading maps - one keyed by direct-child paragraph index
-    /// (<c>Elements&lt;Paragraph&gt;</c>) and one by all-descendants index
-    /// (<c>Descendants&lt;Paragraph&gt;</c>).  Different rules use different traversals,
-    /// so we need both to reliably match a result's paragraph index to a heading.
-    /// </summary>
-    private static (
-        List<(int Index, string Text)> ElementsMap,
-        List<(int Index, string Text)> DescendantsMap
-    ) BuildSectionMaps(WordprocessingDocument doc, UniversityConfig config)
-    {
-        var elementsMap = new List<(int, string)>();
-        var descendantsMap = new List<(int, string)>();
-
-        // Elements-based map (direct body children only - matches FontFamily, List, Grammar, FigureCaption, EmptySection rules)
-        foreach (var (para, elemIdx) in DocumentAnalysisScope.BodyParagraphs(doc, config))
-        {
-            var level = HeadingDetectionService.GetHeadingLevel(doc, para);
-            if (level is null) continue;
-
-            var text = TextExtractionService.GetParagraphText(para, config).Trim();
-            if (string.IsNullOrWhiteSpace(text)) continue;
-
-            elementsMap.Add((elemIdx, text));
-        }
-
-        // Descendants-based map (all paragraphs incl. table cells - matches SingleSpace, Justification, NoDots, Indent, Spacing, LineSpacing, Hierarchy rules)
-        foreach (var (para, descIdx) in DocumentAnalysisScope.DescendantParagraphs(doc, config))
-        {
-            var level = HeadingDetectionService.GetHeadingLevel(doc, para);
-            if (level is null) continue;
-
-            var text = TextExtractionService.GetParagraphText(para, config).Trim();
-            if (string.IsNullOrWhiteSpace(text)) continue;
-
-            descendantsMap.Add((descIdx, text));
-        }
-
-        return (elementsMap, descendantsMap);
-    }
-
-    /// <summary>
-    /// For each validation result, finds the nearest preceding heading and
-    /// writes it into <see cref="DocumentLocation.Section"/>.
-    /// Uses the correct section map based on which paragraph traversal the rule uses.
-    /// </summary>
-    private static void PopulateSectionContext(
-        List<ValidationResult> results,
-        List<(int Index, string Text)> elementsMap,
-        List<(int Index, string Text)> descendantsMap)
-    {
-        foreach (var result in results)
-        {
-            var paraIdx = result.Location?.Paragraph ?? 0;
-            if (paraIdx <= 0) continue;
-
-            var map = result.ParagraphIndexKind == ParagraphIndexKind.BodyElement
-                ? elementsMap
-                : descendantsMap;
-
-            var section = FindNearestSection(map, paraIdx);
-
-            if (section is not null)
-                result.Location!.Section = section;
-        }
-    }
-
-    private static string? FindNearestSection(List<(int Index, string Text)> map, int paraIdx)
-    {
-        string? nearest = null;
-        foreach (var (idx, text) in map)
-        {
-            if (idx <= paraIdx)
-                nearest = text;
-            else
-                break;
-        }
-        return nearest;
-    }
-
-    private IReadOnlyList<IValidationRule> FilterRules(
-        UniversityConfig config,
-        IEnumerable<string>? selectedRules)
-    {
-        IReadOnlyList<IValidationRule> candidates;
-        if (selectedRules is null)
-        {
-            candidates = _ruleList;
-        }
-        else
-        {
-            var selectedSet = selectedRules.ToHashSet(StringComparer.OrdinalIgnoreCase);
-            candidates = selectedSet.Count == 0
-                ? _ruleList
-                : _ruleList.Where(rule => selectedSet.Contains(rule.Name)).ToList();
-        }
-
-        return candidates.ToList();
-    }
-}
-
diff --git a/backend/Services/Comments/DocumentCommentService.cs b/backend/Services/Comments/DocumentCommentService.cs
deleted file mode 100644
index d3eb717..0000000
--- a/backend/Services/Comments/DocumentCommentService.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-
-namespace backend.Services.Comments;
-
-/// <summary>
-/// Service for adding comments to Word documents.
-/// </summary>
-public class DocumentCommentService
-{
-    private int _commentIdCounter = 0;
-
-    /// <summary>
-    /// Add a comment to a specific run in the document.
-    /// </summary>
-    public void AddCommentToRun(WordprocessingDocument doc, Run run, string commentText, string author = "Thesis Validator")
-    {
-        var commentsPart = GetOrCreateCommentsPart(doc);
-        var commentId = GetNextCommentId(commentsPart);
-
-        var comment = new Comment
-        {
-            Id = commentId.ToString(),
-            Author = author,
-            Date = DateTime.Now,
-            Initials = GetInitials(author)
-        };
-
-        comment.AppendChild(new Paragraph(
-            new Run(new Text(commentText))
-        ));
-
-        commentsPart.Comments.AppendChild(comment);
-
-        var parent = run.Parent;
-        if (parent == null) return;
-
-        var commentRangeStart = new CommentRangeStart { Id = commentId.ToString() };
-        var commentRangeEnd = new CommentRangeEnd { Id = commentId.ToString() };
-        var commentReference = new Run(new CommentReference { Id = commentId.ToString() });
-
-        parent.InsertBefore(commentRangeStart, run);
-        parent.InsertAfter(commentRangeEnd, run);
-        parent.InsertAfter(commentReference, commentRangeEnd);
-    }
-
-    /// <summary>
-    /// Add a comment to an entire paragraph.
-    /// </summary>
-    public void AddCommentToParagraph(WordprocessingDocument doc, Paragraph paragraph, string commentText, string author = "Thesis Validator")
-    {
-        var firstRun = paragraph.Elements<Run>().FirstOrDefault();
-        if (firstRun != null)
-        {
-            AddCommentToRun(doc, firstRun, commentText, author);
-            return;
-        }
-
-        var commentsPart = GetOrCreateCommentsPart(doc);
-        var commentId = GetNextCommentId(commentsPart);
-
-        var comment = new Comment
-        {
-            Id = commentId.ToString(),
-            Author = author,
-            Date = DateTime.Now,
-            Initials = GetInitials(author)
-        };
-
-        comment.AppendChild(new Paragraph(
-            new Run(new Text(commentText))
-        ));
-
-        commentsPart.Comments.AppendChild(comment);
-
-        var commentRangeStart = new CommentRangeStart { Id = commentId.ToString() };
-        var commentRangeEnd = new CommentRangeEnd { Id = commentId.ToString() };
-        var commentReference = new Run(new CommentReference { Id = commentId.ToString() });
-
-        paragraph.InsertAt(commentRangeStart, 0);
-        paragraph.AppendChild(commentRangeEnd);
-        paragraph.AppendChild(commentReference);
-    }
-
-    /// <summary>
-    /// Add a comment at a specific character offset within a paragraph.
-    /// </summary>
-    public void AddCommentAtOffset(WordprocessingDocument doc, Paragraph paragraph, int offset, int length, string commentText, string author = "Thesis Validator")
-    {
-        var runs = paragraph.Elements<Run>().ToList();
-        var currentOffset = 0;
-
-        foreach (var run in runs)
-        {
-            var runText = GetRunText(run);
-            var runStart = currentOffset;
-            var runEnd = currentOffset + runText.Length;
-
-            if (offset < runEnd && offset + length > runStart)
-            {
-                AddCommentToRun(doc, run, commentText, author);
-                return;
-            }
-
-            currentOffset = runEnd;
-        }
-
-        if (runs.Count > 0)
-        {
-            AddCommentToRun(doc, runs[0], commentText, author);
-        }
-        else
-        {
-            AddCommentToParagraph(doc, paragraph, commentText, author);
-        }
-    }
-
-    /// <summary>
-    /// Save the document with comments to a new stream.
-    /// </summary>
-    public static MemoryStream SaveDocumentWithComments(WordprocessingDocument doc)
-    {
-        var outputStream = new MemoryStream();
-
-        using (var clone = doc.Clone(outputStream))
-        {
-        }
-
-        outputStream.Position = 0;
-        return outputStream;
-    }
-
-    private static string GetRunText(Run run)
-    {
-        return string.Concat(run.Elements<Text>().Select(t => t.Text));
-    }
-
-    private static WordprocessingCommentsPart GetOrCreateCommentsPart(WordprocessingDocument doc)
-    {
-        var commentsPart = doc.MainDocumentPart!.WordprocessingCommentsPart;
-        if (commentsPart is null)
-        {
-            commentsPart = doc.MainDocumentPart.AddNewPart<WordprocessingCommentsPart>();
-        }
-
-        commentsPart.Comments ??= new DocumentFormat.OpenXml.Wordprocessing.Comments();
-        return commentsPart;
-    }
-
-    private int GetNextCommentId(WordprocessingCommentsPart commentsPart)
-    {
-        var maxExistingId = commentsPart.Comments?
-            .Elements<Comment>()
-            .Select(comment => int.TryParse(comment.Id?.Value, out var id) ? id : -1)
-            .DefaultIfEmpty(-1)
-            .Max() ?? -1;
-
-        _commentIdCounter = Math.Max(_commentIdCounter, maxExistingId + 1);
-        return _commentIdCounter++;
-    }
-
-    private static string GetInitials(string author)
-    {
-        var words = author.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-        return string.Concat(words.Select(w => char.ToUpper(w[0])));
-    }
-}
diff --git a/backend/Services/Results/SeverityResolver.cs b/backend/Services/Results/SeverityResolver.cs
deleted file mode 100644
index 9853ae7..0000000
--- a/backend/Services/Results/SeverityResolver.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using ThesisValidator.Rules;
-
-namespace backend.Services.Results;
-
-public static class SeverityResolver
-{
-    public static string Resolve(
-        string ruleId,
-        UniversityConfig config,
-        string? explicitSeverity = null)
-    {
-        var configuredSeverity = config.Rules.GetOverride(ruleId)?.Severity;
-        if (!string.IsNullOrWhiteSpace(configuredSeverity))
-            return ValidationSeverity.Normalize(configuredSeverity);
-
-        if (!string.IsNullOrWhiteSpace(explicitSeverity))
-            return ValidationSeverity.Normalize(explicitSeverity);
-
-        return ValidationSeverity.Normalize(RuleCatalog.GetDefinition(ruleId).DefaultSeverity);
-    }
-}
diff --git a/backend/Services/Results/ValidationResultFactory.cs b/backend/Services/Results/ValidationResultFactory.cs
deleted file mode 100644
index 5108c6c..0000000
--- a/backend/Services/Results/ValidationResultFactory.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using backend.Models;
-using Backend.Models;
-using ThesisValidator.Rules;
-
-namespace backend.Services.Results;
-
-public static class ValidationResultFactory
-{
-    public static ValidationResult Create(
-        string ruleId,
-        UniversityConfig config,
-        string message,
-        DocumentLocation? location = null,
-        ParagraphIndexKind indexKind = ParagraphIndexKind.Descendant,
-        string? severity = null,
-        string? category = null)
-    {
-        var definition = RuleCatalog.GetDefinition(ruleId);
-        return new ValidationResult
-        {
-            RuleName = ruleId,
-            Message = message,
-            Severity = SeverityResolver.Resolve(ruleId, config, severity),
-            Category = category ?? definition.Category,
-            ParagraphIndexKind = indexKind,
-            Location = location ?? new DocumentLocation()
-        };
-    }
-
-    public static ValidationResult ForParagraph(
-        string ruleId,
-        UniversityConfig config,
-        string message,
-        int paragraph,
-        string text,
-        ParagraphIndexKind indexKind = ParagraphIndexKind.Descendant,
-        string? severity = null,
-        string? category = null)
-    {
-        return Create(
-            ruleId,
-            config,
-            message,
-            new DocumentLocation
-            {
-                Paragraph = paragraph,
-                Text = text
-            },
-            indexKind,
-            severity,
-            category);
-    }
-
-    public static ValidationResult ForRun(
-        string ruleId,
-        UniversityConfig config,
-        string message,
-        int paragraph,
-        int run,
-        int characterOffset,
-        int length,
-        string text,
-        ParagraphIndexKind indexKind = ParagraphIndexKind.Descendant,
-        string? severity = null,
-        string? category = null)
-    {
-        return Create(
-            ruleId,
-            config,
-            message,
-            new DocumentLocation
-            {
-                Paragraph = paragraph,
-                Run = run,
-                CharacterOffset = characterOffset,
-                Length = length,
-                Text = text
-            },
-            indexKind,
-            severity,
-            category);
-    }
-}
diff --git a/backend/Services/Skipping/ISkipRule.cs b/backend/Services/Skipping/ISkipRule.cs
deleted file mode 100644
index d05beae..0000000
--- a/backend/Services/Skipping/ISkipRule.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-
-namespace backend.Services.Skipping;
-
-public interface ISkipRule
-{
-    SkipDecision ShouldSkipParagraph(
-        WordprocessingDocument doc,
-        Paragraph paragraph,
-        UniversityConfig config,
-        SkipContext context)
-    {
-        return SkipDecision.Include;
-    }
-
-    SkipDecision ShouldSkipRun(
-        WordprocessingDocument doc,
-        Paragraph paragraph,
-        Run run,
-        UniversityConfig config,
-        SkipContext context)
-    {
-        return SkipDecision.Include;
-    }
-
-    SkipDecision ShouldSkipElement(
-        OpenXmlElement element,
-        UniversityConfig config,
-        SkipContext context)
-    {
-        return SkipDecision.Include;
-    }
-}
diff --git a/backend/Services/Skipping/SkipDecision.cs b/backend/Services/Skipping/SkipDecision.cs
deleted file mode 100644
index bac1f73..0000000
--- a/backend/Services/Skipping/SkipDecision.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using DocumentFormat.OpenXml.Wordprocessing;
-
-namespace backend.Services.Skipping;
-
-public enum SkipReason
-{
-    None,
-    TextBox,
-    TableOfContents,
-    BeforeTableOfContents,
-    StructuralStyle
-}
-
-public sealed record SkipDecision(
-    bool ShouldSkip,
-    SkipReason Reason = SkipReason.None,
-    string? Detail = null)
-{
-    public static SkipDecision Include { get; } = new(false);
-
-    public static SkipDecision Skip(SkipReason reason, string? detail = null)
-    {
-        return new SkipDecision(true, reason, detail);
-    }
-}
-
-public sealed record SkipContext(
-    int? ParagraphIndex = null,
-    int? FirstIncludedParagraphIndex = null,
-    IReadOnlySet<Paragraph>? TableOfContentsParagraphs = null);
diff --git a/backend/Services/Skipping/SkipDecisionService.cs b/backend/Services/Skipping/SkipDecisionService.cs
deleted file mode 100644
index f05296c..0000000
--- a/backend/Services/Skipping/SkipDecisionService.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using backend.Services.Formatting;
-using Backend.Models;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-
-namespace backend.Services.Skipping;
-
-public static class SkipDecisionService
-{
-    private static readonly ISkipRule[] ParagraphRules =
-    [
-        new TableOfContentsSkipRule(),
-        new TextBoxSkipRule()
-    ];
-
-    private static readonly ISkipRule[] RunRules =
-    [
-        new TextBoxSkipRule()
-    ];
-
-    private static readonly StructuralStyleSkipRule StructuralStyleRule = new();
-
-    public static bool ShouldSkipTextBoxes(UniversityConfig config)
-    {
-        return config.Analysis.SkipTextBoxes ?? config.Formatting.SkipTextBoxes;
-    }
-
-    public static bool ShouldSkipTableOfContentsContent(UniversityConfig config)
-    {
-        return config.Analysis.SkipTableOfContentsContent
-            ?? config.Formatting.SkipTableOfContentsContent;
-    }
-
-    public static bool ShouldSkipBeforeTableOfContents(UniversityConfig config)
-    {
-        return config.Analysis.SkipBeforeTableOfContents
-            ?? config.Formatting.SkipBeforeTableOfContents;
-    }
-
-    public static SkipDecision ShouldSkipParagraph(
-        WordprocessingDocument doc,
-        Paragraph paragraph,
-        UniversityConfig config,
-        SkipContext? context = null)
-    {
-        var effectiveContext = context ?? new SkipContext();
-        if (effectiveContext.ParagraphIndex < effectiveContext.FirstIncludedParagraphIndex)
-        {
-            return SkipDecision.Skip(
-                SkipReason.BeforeTableOfContents,
-                "Content appears before the configured table-of-contents boundary.");
-        }
-
-        foreach (var rule in ParagraphRules)
-        {
-            var decision = rule.ShouldSkipParagraph(doc, paragraph, config, effectiveContext);
-            if (decision.ShouldSkip)
-                return decision;
-        }
-
-        return SkipDecision.Include;
-    }
-
-    public static SkipDecision ShouldSkipRun(
-        WordprocessingDocument doc,
-        Paragraph paragraph,
-        Run run,
-        UniversityConfig config,
-        SkipContext? context = null)
-    {
-        var effectiveContext = context ?? new SkipContext();
-        foreach (var rule in RunRules)
-        {
-            var decision = rule.ShouldSkipRun(doc, paragraph, run, config, effectiveContext);
-            if (decision.ShouldSkip)
-                return decision;
-        }
-
-        return SkipDecision.Include;
-    }
-
-    public static SkipDecision ShouldSkipElement(
-        OpenXmlElement element,
-        UniversityConfig config,
-        SkipContext? context = null)
-    {
-        var effectiveContext = context ?? new SkipContext();
-        foreach (var rule in ParagraphRules.Concat(RunRules))
-        {
-            var decision = rule.ShouldSkipElement(element, config, effectiveContext);
-            if (decision.ShouldSkip)
-                return decision;
-        }
-
-        return SkipDecision.Include;
-    }
-
-    public static SkipDecision ShouldSkipStructuralStyle(
-        WordprocessingDocument doc,
-        Paragraph paragraph)
-    {
-        return StructuralStyleRule.ShouldSkipParagraph(
-            doc,
-            paragraph,
-            new UniversityConfig(),
-            new SkipContext());
-    }
-
-    public static SkipDecision ShouldSkipStructuralStyle(Paragraph paragraph)
-    {
-        return StructuralStyleRule.ShouldSkipParagraph(
-            null,
-            paragraph,
-            new UniversityConfig(),
-            new SkipContext());
-    }
-
-    public static bool HasExcludedStructuralStyle(Paragraph paragraph)
-    {
-        return ShouldSkipStructuralStyle(paragraph).ShouldSkip;
-    }
-
-    public static bool HasExcludedStructuralStyle(WordprocessingDocument doc, Paragraph paragraph)
-    {
-        return ShouldSkipStructuralStyle(doc, paragraph).ShouldSkip;
-    }
-
-    public static bool IsListItem(Paragraph paragraph)
-    {
-        return paragraph.ParagraphProperties?.NumberingProperties is not null;
-    }
-
-    public static string? GetParagraphStyleId(Paragraph paragraph)
-    {
-        return StyleResolutionService.GetParagraphStyleId(paragraph);
-    }
-}
diff --git a/backend/Services/Skipping/StructuralStyleSkipRule.cs b/backend/Services/Skipping/StructuralStyleSkipRule.cs
deleted file mode 100644
index b5a5d69..0000000
--- a/backend/Services/Skipping/StructuralStyleSkipRule.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using backend.Services.Formatting;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-
-namespace backend.Services.Skipping;
-
-public sealed class StructuralStyleSkipRule : ISkipRule
-{
-    private static readonly string[] ExcludedStylePatterns =
-    [
-        "heading", "nagwek",
-        "title", "tytu",
-        "subtitle", "podtytu",
-        "caption", "podpis",
-        "toc", "spis",
-        "quote", "cytat",
-        "header", "footer",
-        "list", "lista",
-        "legend", "legenda",
-        "figure", "rysunek",
-        "rys",
-        "table",
-        "bibliography"
-    ];
-
-    public SkipDecision ShouldSkipParagraph(
-        WordprocessingDocument? doc,
-        Paragraph paragraph,
-        UniversityConfig config,
-        SkipContext context)
-    {
-        var styleId = StyleResolutionService.GetParagraphStyleId(paragraph);
-        if (ContainsExcludedPattern(styleId))
-        {
-            return SkipDecision.Skip(
-                SkipReason.StructuralStyle,
-                $"Paragraph style '{styleId}' is excluded from body-text validation.");
-        }
-
-        if (doc is null)
-            return SkipDecision.Include;
-
-        var style = StyleResolutionService.FindStyle(doc, styleId);
-        var styleName = style?.StyleName?.Val?.Value;
-        if (ContainsExcludedPattern(styleName))
-        {
-            return SkipDecision.Skip(
-                SkipReason.StructuralStyle,
-                $"Paragraph style name '{styleName}' is excluded from body-text validation.");
-        }
-
-        var outlineLevel = style?.StyleParagraphProperties?.OutlineLevel?.Val?.Value;
-        return outlineLevel.HasValue && outlineLevel.Value <= 8
-            ? SkipDecision.Skip(SkipReason.StructuralStyle, "Paragraph style has a heading outline level.")
-            : SkipDecision.Include;
-    }
-
-    private static bool ContainsExcludedPattern(string? value)
-    {
-        if (string.IsNullOrEmpty(value))
-            return false;
-
-        var valueLower = value.ToLowerInvariant();
-        return ExcludedStylePatterns.Any(pattern => valueLower.Contains(pattern));
-    }
-}
diff --git a/backend/Services/Skipping/TableOfContentsSkipRule.cs b/backend/Services/Skipping/TableOfContentsSkipRule.cs
deleted file mode 100644
index 8927991..0000000
--- a/backend/Services/Skipping/TableOfContentsSkipRule.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using Backend.Models;
-using backend.Services.Structure;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-
-namespace backend.Services.Skipping;
-
-public sealed class TableOfContentsSkipRule : ISkipRule
-{
-    public SkipDecision ShouldSkipParagraph(
-        WordprocessingDocument doc,
-        Paragraph paragraph,
-        UniversityConfig config,
-        SkipContext context)
-    {
-        if (context.TableOfContentsParagraphs?.Contains(paragraph) == true)
-        {
-            return SkipDecision.Skip(
-                SkipReason.TableOfContents,
-                "Paragraph belongs to table-of-contents content.");
-        }
-
-        return SkipDecision.Include;
-    }
-
-    public static bool IsTableOfContentsParagraph(Paragraph paragraph)
-    {
-        return TableOfContentsDetectionService.ContainsTocFieldCode(paragraph)
-            || IsTocStyleParagraph(paragraph);
-    }
-
-    public static HashSet<Paragraph> GetSkippedParagraphs(
-        WordprocessingDocument doc,
-        UniversityConfig config)
-    {
-        var paragraphs = new HashSet<Paragraph>();
-        if (!SkipDecisionService.ShouldSkipTableOfContentsContent(config))
-            return paragraphs;
-
-        var body = doc.MainDocumentPart?.Document.Body;
-        if (body is null)
-            return paragraphs;
-
-        bool inTocField = false;
-        foreach (var paragraph in body.Descendants<Paragraph>())
-        {
-            if (TableOfContentsDetectionService.ContainsTocFieldCode(paragraph))
-            {
-                inTocField = true;
-                paragraphs.Add(paragraph);
-            }
-
-            if (inTocField)
-            {
-                paragraphs.Add(paragraph);
-            }
-            else if (IsTocStyleParagraph(paragraph))
-            {
-                paragraphs.Add(paragraph);
-            }
-
-            if (inTocField && ContainsFieldEnd(paragraph))
-            {
-                inTocField = false;
-            }
-        }
-
-        return paragraphs;
-    }
-
-    public static int GetFirstIncludedDescendantParagraphIndex(
-        WordprocessingDocument doc,
-        UniversityConfig config)
-    {
-        if (!SkipDecisionService.ShouldSkipBeforeTableOfContents(config))
-            return 1;
-
-        var detection = TableOfContentsDetectionService.Detect(doc);
-        return detection.ParagraphIndex > 0 ? detection.ParagraphIndex + 1 : 1;
-    }
-
-    public static int GetFirstIncludedBodyParagraphIndex(
-        WordprocessingDocument doc,
-        UniversityConfig config)
-    {
-        if (!SkipDecisionService.ShouldSkipBeforeTableOfContents(config))
-            return 1;
-
-        var body = doc.MainDocumentPart?.Document.Body;
-        if (body is null)
-            return 1;
-
-        var firstIncludedChildIndex = GetFirstIncludedBodyChildIndex(doc, config);
-        int paragraphIndex = 0;
-        int childIndex = 0;
-
-        foreach (var child in body.ChildElements)
-        {
-            if (child is Paragraph)
-                paragraphIndex++;
-
-            if (childIndex >= firstIncludedChildIndex && child is Paragraph)
-                return paragraphIndex;
-
-            childIndex++;
-        }
-
-        return int.MaxValue;
-    }
-
-    public static int GetFirstIncludedBodyChildIndex(
-        WordprocessingDocument doc,
-        UniversityConfig config)
-    {
-        if (!SkipDecisionService.ShouldSkipBeforeTableOfContents(config))
-            return 0;
-
-        var body = doc.MainDocumentPart?.Document.Body;
-        if (body is null)
-            return 0;
-
-        var tocParagraph = TableOfContentsDetectionService.Detect(doc).Paragraph;
-        if (tocParagraph is null)
-            return 0;
-
-        var tocBodyChild = GetBodyChildAncestor(tocParagraph, body);
-        if (tocBodyChild is null)
-            return 0;
-
-        int childIndex = 0;
-        foreach (var child in body.ChildElements)
-        {
-            if (ReferenceEquals(child, tocBodyChild))
-                return childIndex + 1;
-
-            childIndex++;
-        }
-
-        return 0;
-    }
-
-    public static bool IsTocStyleParagraph(Paragraph paragraph)
-    {
-        var styleId = paragraph.ParagraphProperties?.ParagraphStyleId?.Val?.Value;
-        if (string.IsNullOrWhiteSpace(styleId))
-            return false;
-
-        var normalized = styleId.Replace(" ", "", StringComparison.OrdinalIgnoreCase);
-        return normalized.StartsWith("TOC", StringComparison.OrdinalIgnoreCase)
-            || normalized.StartsWith("Spis", StringComparison.OrdinalIgnoreCase)
-            || normalized.Contains("TableOfContents", StringComparison.OrdinalIgnoreCase);
-    }
-
-    private static bool ContainsFieldEnd(Paragraph paragraph)
-    {
-        return paragraph.Descendants<FieldChar>()
-            .Any(fieldChar => fieldChar.FieldCharType?.Value == FieldCharValues.End);
-    }
-
-    private static OpenXmlElement? GetBodyChildAncestor(OpenXmlElement element, Body body)
-    {
-        OpenXmlElement? current = element;
-        while (current?.Parent is not null && current.Parent != body)
-        {
-            current = current.Parent;
-        }
-
-        return current?.Parent == body ? current : null;
-    }
-}
diff --git a/backend/Services/Structure/FigureCaptionDetector.cs b/backend/Services/Structure/FigureCaptionDetector.cs
deleted file mode 100644
index d584174..0000000
--- a/backend/Services/Structure/FigureCaptionDetector.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-using backend.Services.Analysis;
-using backend.Services.Extraction;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-
-namespace backend.Services.Structure;
-
-public enum FigureCaptionRelationKind
-{
-    None,
-    Below,
-    Above,
-    SeparatedBelow
-}
-
-public sealed record FigureCandidate(Paragraph Paragraph, int ParagraphIndex);
-
-public sealed record FigureCaptionCandidate(
-    Paragraph Paragraph,
-    int ParagraphIndex,
-    string Text,
-    bool HasFigureSequenceField,
-    bool UsesDedicatedCaptionStyle,
-    bool LooksLikeFigureCaptionText)
-{
-    public bool IsStructuredCaption => HasFigureSequenceField || UsesDedicatedCaptionStyle;
-}
-
-public sealed record FigureCaptionAssociation(
-    FigureCandidate Figure,
-    FigureCaptionCandidate? Caption,
-    FigureCaptionRelationKind Relation)
-{
-    public bool HasCaption => Caption is not null;
-    public bool IsCaptionBelowFigure => Relation == FigureCaptionRelationKind.Below;
-}
-
-public static class FigureCaptionDetector
-{
-    private const int MaxFollowingParagraphs = 4;
-    private const int MaxPreviousParagraphs = 2;
-
-    public static IReadOnlyList<FigureCaptionAssociation> AssociateFiguresWithCaptions(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        bool requireStructuredCaption = false)
-    {
-        var paragraphs = DocumentAnalysisScope.DescendantParagraphs(doc, config).ToList();
-        var associations = new List<FigureCaptionAssociation>();
-
-        for (int i = 0; i < paragraphs.Count; i++)
-        {
-            var (paragraph, paragraphIndex) = paragraphs[i];
-            if (!FigureDetectionService.ContainsFigureCandidate(paragraph, config))
-                continue;
-
-            var figure = new FigureCandidate(paragraph, paragraphIndex);
-            var below = FindFollowingCaption(doc, config, paragraphs, i, requireStructuredCaption);
-            if (below is not null)
-            {
-                associations.Add(new FigureCaptionAssociation(figure, below.Value.Caption, below.Value.Relation));
-                continue;
-            }
-
-            var above = FindPreviousCaption(doc, config, paragraphs, i, requireStructuredCaption);
-            associations.Add(above is null
-                ? new FigureCaptionAssociation(figure, null, FigureCaptionRelationKind.None)
-                : new FigureCaptionAssociation(figure, above, FigureCaptionRelationKind.Above));
-        }
-
-        return associations;
-    }
-
-    public static IReadOnlyList<FigureCaptionCandidate> GetDetectedFigureCaptions(
-        WordprocessingDocument doc,
-        UniversityConfig config)
-    {
-        return AssociateFiguresWithCaptions(doc, config)
-            .Where(association => association.Caption is not null)
-            .Select(association => association.Caption!)
-            .GroupBy(caption => caption.ParagraphIndex)
-            .Select(group => group.First())
-            .ToList();
-    }
-
-    private static (FigureCaptionCandidate Caption, FigureCaptionRelationKind Relation)? FindFollowingCaption(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        IReadOnlyList<(Paragraph Paragraph, int Index)> paragraphs,
-        int figureListIndex,
-        bool requireStructuredCaption)
-    {
-        var hasInterveningContent = false;
-        var end = Math.Min(paragraphs.Count - 1, figureListIndex + MaxFollowingParagraphs);
-
-        for (int i = figureListIndex + 1; i <= end; i++)
-        {
-            var (paragraph, paragraphIndex) = paragraphs[i];
-            var text = TextExtractionService.GetParagraphText(doc, paragraph, config).Trim();
-            var hasMeaningfulText = TextExtractionService.HasMeaningfulContent(text);
-            var containsFigure = FigureDetectionService.ContainsFigureCandidate(paragraph, config);
-            var caption = CreateCaptionCandidate(doc, config, paragraph, paragraphIndex, text);
-
-            if (caption is not null && (!requireStructuredCaption || caption.IsStructuredCaption))
-            {
-                return (
-                    caption,
-                    hasInterveningContent
-                        ? FigureCaptionRelationKind.SeparatedBelow
-                        : FigureCaptionRelationKind.Below);
-            }
-
-            if (containsFigure)
-                break;
-
-            if (!hasMeaningfulText)
-                continue;
-
-            hasInterveningContent = true;
-        }
-
-        return null;
-    }
-
-    private static FigureCaptionCandidate? FindPreviousCaption(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        IReadOnlyList<(Paragraph Paragraph, int Index)> paragraphs,
-        int figureListIndex,
-        bool requireStructuredCaption)
-    {
-        var start = Math.Max(0, figureListIndex - MaxPreviousParagraphs);
-
-        for (int i = figureListIndex - 1; i >= start; i--)
-        {
-            var (paragraph, paragraphIndex) = paragraphs[i];
-            var text = TextExtractionService.GetParagraphText(doc, paragraph, config).Trim();
-            var hasMeaningfulText = TextExtractionService.HasMeaningfulContent(text);
-            var containsFigure = FigureDetectionService.ContainsFigureCandidate(paragraph, config);
-            var caption = CreateCaptionCandidate(doc, config, paragraph, paragraphIndex, text);
-
-            if (caption is not null && (!requireStructuredCaption || caption.IsStructuredCaption))
-                return caption;
-
-            if (!hasMeaningfulText && !containsFigure)
-                continue;
-
-            break;
-        }
-
-        return null;
-    }
-
-    private static FigureCaptionCandidate? CreateCaptionCandidate(
-        WordprocessingDocument doc,
-        UniversityConfig config,
-        Paragraph paragraph,
-        int paragraphIndex,
-        string text)
-    {
-        var hasMeaningfulText = TextExtractionService.HasMeaningfulContent(text);
-        var hasFigureSequenceField = CaptionDetectionService.HasFigureSequenceField(paragraph);
-        var usesDedicatedCaptionStyle = hasMeaningfulText
-            && CaptionDetectionService.UsesDedicatedCaptionStyle(doc, paragraph);
-        var looksLikeFigureCaptionText = hasMeaningfulText
-            && CaptionDetectionService.LooksLikeFigureCaptionText(text);
-
-        return hasFigureSequenceField || usesDedicatedCaptionStyle || looksLikeFigureCaptionText
-            ? new FigureCaptionCandidate(
-                paragraph,
-                paragraphIndex,
-                text,
-                hasFigureSequenceField,
-                usesDedicatedCaptionStyle,
-                looksLikeFigureCaptionText)
-            : null;
-    }
-}
diff --git a/backend/appsettings.json b/backend/appsettings.json
deleted file mode 100644
index 7b8426a..0000000
--- a/backend/appsettings.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*",
-  "Validation": {
-    "CodeBlockDetection": {
-      "MinimumCodeFontTextRatio": 0.7,
-      "RequireWholeParagraphMonospace": false,
-      "CodeFonts": [
-        "Consolas",
-        "Courier New",
-        "Courier",
-        "Lucida Console",
-        "Cascadia Code",
-        "Cascadia Mono",
-        "JetBrains Mono",
-        "Fira Code",
-        "Source Code Pro",
-        "Menlo",
-        "Monaco",
-        "DejaVu Sans Mono",
-        "Liberation Mono"
-      ]
-    }
-  },
-  "LanguageTool": {
-    "BaseUrl": "http://localhost:8010"
-  },
-  "UniversityConfig": {
-    "Name": "Default University",
-    "Language": "pl-PL",
-    "Analysis": {
-      "SkipTextBoxes": true,
-      "SkipTableOfContentsContent": true
-    },
-    "Rules": {
-      "Overrides": {}
-    },
-    "Formatting": {
-      "Font": {
-        "FontFamily": "Times New Roman",
-        "FontSize": 12
-      },
-      "SkipTextBoxes": true,
-      "SkipTableOfContentsContent": true,
-      "Layout": {
-        "MarginLeft": 2.5,
-        "MarginRight": 2.5,
-        "RequiredIndentCm": 1.25,
-        "ParagraphSpacingRule": [0, 6]
-      }
-    }
-  }
-}
diff --git a/backend/backend.http b/backend/backend.http
deleted file mode 100644
index a51decd..0000000
--- a/backend/backend.http
+++ /dev/null
@@ -1,6 +0,0 @@
-@backend_HostAddress = http://localhost:5213
-
-GET {{backend_HostAddress}}/weatherforecast/
-Accept: application/json
-
-###
diff --git a/backend/docker-compose.yml b/docker/docker-compose.yml
similarity index 100%
rename from backend/docker-compose.yml
rename to docker/docker-compose.yml
diff --git a/ThesisValidator.postman_collection.json b/docs/architecture/api/postman/ThesisValidator.postman_collection.json
similarity index 100%
rename from ThesisValidator.postman_collection.json
rename to docs/architecture/api/postman/ThesisValidator.postman_collection.json
diff --git a/docs/screenshots/.gitkeep b/docs/screenshots/.gitkeep
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/docs/screenshots/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/docs/screenshots/MainPage.png b/docs/screenshots/MainPage.png
new file mode 100644
index 0000000..585e41f
Binary files /dev/null and b/docs/screenshots/MainPage.png differ
diff --git a/docs/screenshots/RuleSettings.png b/docs/screenshots/RuleSettings.png
new file mode 100644
index 0000000..177ee2c
Binary files /dev/null and b/docs/screenshots/RuleSettings.png differ
diff --git a/docs/screenshots/ValidationResult.png b/docs/screenshots/ValidationResult.png
new file mode 100644
index 0000000..d054374
Binary files /dev/null and b/docs/screenshots/ValidationResult.png differ
diff --git a/src/backend/Annotation/AnnotationApplicator.cs b/src/backend/Annotation/AnnotationApplicator.cs
new file mode 100644
index 0000000..2f44e3e
--- /dev/null
+++ b/src/backend/Annotation/AnnotationApplicator.cs
@@ -0,0 +1,46 @@
+using backend.Application.Validation;
+using DocumentFormat.OpenXml.Packaging;
+using ThesisValidator.Rules;
+
+namespace backend.Annotation;
+
+public sealed class AnnotationApplicator
+{
+    public void Apply(
+        WordprocessingDocument document,
+        IEnumerable<RuleExecution> executions)
+    {
+        var commentService = new CommentWriter();
+
+        foreach (var execution in executions)
+        {
+            AddCommentForProblem(
+                commentService,
+                document,
+                execution.Problem);
+        }
+    }
+
+    private static void AddCommentForProblem(
+        CommentWriter commentService,
+        WordprocessingDocument document,
+        RuleProblem problem)
+    {
+        switch (problem.AnnotationTarget)
+        {
+            case ParagraphAnnotationTarget paragraphTarget:
+                commentService.AddCommentToParagraph(
+                    document,
+                    paragraphTarget.Paragraph,
+                    problem.Message);
+                break;
+
+            case RunAnnotationTarget runTarget:
+                commentService.AddCommentToRun(
+                    document,
+                    runTarget.Run,
+                    problem.Message);
+                break;
+        }
+    }
+}
diff --git a/src/backend/Annotation/CommentWriter.cs b/src/backend/Annotation/CommentWriter.cs
new file mode 100644
index 0000000..ac3030c
--- /dev/null
+++ b/src/backend/Annotation/CommentWriter.cs
@@ -0,0 +1,112 @@
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+
+namespace backend.Annotation;
+
+public sealed class CommentWriter
+{
+    private int _commentIdCounter;
+
+    public void AddCommentToRun(
+        WordprocessingDocument document,
+        Run run,
+        string commentText,
+        string author = "Thesis Validator")
+    {
+        var commentsPart = GetOrCreateCommentsPart(document);
+        var commentId = GetNextCommentId(commentsPart);
+        var commentIdText = commentId.ToString();
+
+        commentsPart.Comments!.AppendChild(CreateComment(commentIdText, commentText, author));
+
+        var parent = run.Parent;
+        if (parent is null)
+            return;
+
+        var commentRangeStart = new CommentRangeStart { Id = commentIdText };
+        var commentRangeEnd = new CommentRangeEnd { Id = commentIdText };
+        var commentReference = new Run(new CommentReference { Id = commentIdText });
+
+        parent.InsertBefore(commentRangeStart, run);
+        parent.InsertAfter(commentRangeEnd, run);
+        parent.InsertAfter(commentReference, commentRangeEnd);
+    }
+
+    public void AddCommentToParagraph(
+        WordprocessingDocument document,
+        Paragraph paragraph,
+        string commentText,
+        string author = "Thesis Validator")
+    {
+        var firstRun = paragraph.Elements<Run>().FirstOrDefault();
+        if (firstRun is not null)
+        {
+            AddCommentToRun(document, firstRun, commentText, author);
+            return;
+        }
+
+        var commentsPart = GetOrCreateCommentsPart(document);
+        var commentId = GetNextCommentId(commentsPart);
+        var commentIdText = commentId.ToString();
+
+        commentsPart.Comments!.AppendChild(CreateComment(commentIdText, commentText, author));
+
+        paragraph.InsertAt(new CommentRangeStart { Id = commentIdText }, 0);
+        paragraph.AppendChild(new CommentRangeEnd { Id = commentIdText });
+        paragraph.AppendChild(new Run(new CommentReference { Id = commentIdText }));
+    }
+
+    public static MemoryStream SaveDocumentWithComments(WordprocessingDocument document)
+    {
+        var outputStream = new MemoryStream();
+        using (document.Clone(outputStream))
+        {
+        }
+
+        outputStream.Position = 0;
+        return outputStream;
+    }
+
+    private static Comment CreateComment(string id, string commentText, string author)
+    {
+        var comment = new Comment
+        {
+            Id = id,
+            Author = author,
+            Date = DateTime.Now,
+            Initials = GetInitials(author)
+        };
+
+        comment.AppendChild(new Paragraph(new Run(new Text(commentText))));
+        return comment;
+    }
+
+    private static WordprocessingCommentsPart GetOrCreateCommentsPart(WordprocessingDocument document)
+    {
+        var commentsPart = document.MainDocumentPart!.WordprocessingCommentsPart
+            ?? document.MainDocumentPart.AddNewPart<WordprocessingCommentsPart>();
+
+        commentsPart.Comments ??= new Comments();
+        return commentsPart;
+    }
+
+    private int GetNextCommentId(WordprocessingCommentsPart commentsPart)
+    {
+        var maxExistingId = commentsPart.Comments?
+            .Elements<Comment>()
+            .Select(comment => int.TryParse(comment.Id?.Value, out var id) ? id : -1)
+            .DefaultIfEmpty(-1)
+            .Max() ?? -1;
+
+        _commentIdCounter = Math.Max(_commentIdCounter, maxExistingId + 1);
+        return _commentIdCounter++;
+    }
+
+    private static string GetInitials(string author)
+    {
+        return string.Concat(
+            author
+                .Split(' ', StringSplitOptions.RemoveEmptyEntries)
+                .Select(word => char.ToUpperInvariant(word[0])));
+    }
+}
diff --git a/src/backend/Application/Validation/AvailableValidationRule.cs b/src/backend/Application/Validation/AvailableValidationRule.cs
new file mode 100644
index 0000000..f28fc4e
--- /dev/null
+++ b/src/backend/Application/Validation/AvailableValidationRule.cs
@@ -0,0 +1,7 @@
+namespace backend.Application.Validation;
+
+public sealed record AvailableValidationRule(
+    string Id,
+    string DisplayName,
+    string Category,
+    string DefaultSeverity);
diff --git a/src/backend/Application/Validation/RuleExecution.cs b/src/backend/Application/Validation/RuleExecution.cs
new file mode 100644
index 0000000..f186d71
--- /dev/null
+++ b/src/backend/Application/Validation/RuleExecution.cs
@@ -0,0 +1,7 @@
+using ThesisValidator.Rules;
+
+namespace backend.Application.Validation;
+
+public sealed record RuleExecution(
+    ValidationIssue Result,
+    RuleProblem Problem);
diff --git a/src/backend/Application/Validation/RuleRunner.cs b/src/backend/Application/Validation/RuleRunner.cs
new file mode 100644
index 0000000..af00269
--- /dev/null
+++ b/src/backend/Application/Validation/RuleRunner.cs
@@ -0,0 +1,93 @@
+using ThesisValidator.Rules;
+
+namespace backend.Application.Validation;
+
+public sealed class RuleRunner
+{
+    private readonly IReadOnlyList<IValidationRule> _rules;
+    private readonly RulePolicyResolver _policyResolver;
+    private readonly RuleOptionsBinder _optionsBinder;
+    private readonly ValidationIssueComposer _resultComposer;
+
+    public RuleRunner(
+        IEnumerable<IValidationRule> rules,
+        RulePolicyResolver policyResolver,
+        RuleOptionsBinder optionsBinder,
+        ValidationIssueComposer resultComposer)
+    {
+        _rules = rules.ToList();
+        _policyResolver = policyResolver;
+        _optionsBinder = optionsBinder;
+        _resultComposer = resultComposer;
+    }
+
+    public IReadOnlyList<AvailableValidationRule> GetAvailableRules()
+    {
+        return _rules
+            .Select(rule => (Rule: rule, Policy: _policyResolver.Resolve(rule.Descriptor)))
+            .Where(pair => pair.Policy.Availability != RuleAvailability.Hidden)
+            .Select(pair => new AvailableValidationRule(
+                pair.Rule.Descriptor.Name,
+                pair.Rule.Descriptor.DisplayName,
+                pair.Rule.Descriptor.Category,
+                pair.Policy.Severity.ToString()))
+            .ToList();
+    }
+
+    public IReadOnlyList<string> GetUnknownRuleNames(IEnumerable<string> selectedRules)
+    {
+        var knownRules = _rules
+            .Where(rule => _policyResolver.Resolve(rule.Descriptor).Availability != RuleAvailability.Hidden)
+            .Select(rule => rule.Descriptor.Name)
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        return selectedRules
+            .Where(ruleName => !knownRules.Contains(ruleName))
+            .Distinct(StringComparer.OrdinalIgnoreCase)
+            .ToList();
+    }
+
+    public IReadOnlyList<RuleExecution> Run(
+        RuleContext context,
+        IEnumerable<string>? selectedRules)
+    {
+        var executions = new List<RuleExecution>();
+
+        foreach (var rule in GetRulesToRun(selectedRules))
+        {
+            var policy = _policyResolver.Resolve(rule.Descriptor);
+            var boundOptions = _optionsBinder.Bind(rule);
+
+            foreach (var problem in rule.Validate(context, boundOptions))
+            {
+                var result = _resultComposer.Compose(
+                    rule.Descriptor,
+                    policy,
+                    problem);
+
+                executions.Add(new RuleExecution(result, problem));
+            }
+        }
+
+        return executions;
+    }
+
+    private IReadOnlyList<IValidationRule> GetRulesToRun(IEnumerable<string>? selectedRules)
+    {
+        var selectedSet = selectedRules?
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        return _rules
+            .Where(rule =>
+            {
+                var policy = _policyResolver.Resolve(rule.Descriptor);
+                if (policy.Availability == RuleAvailability.Hidden)
+                    return false;
+
+                return selectedSet is null
+                    || selectedSet.Count == 0
+                    || selectedSet.Contains(rule.Descriptor.Name);
+            })
+            .ToList();
+    }
+}
diff --git a/src/backend/Application/Validation/SectionContextResolver.cs b/src/backend/Application/Validation/SectionContextResolver.cs
new file mode 100644
index 0000000..a3fcc23
--- /dev/null
+++ b/src/backend/Application/Validation/SectionContextResolver.cs
@@ -0,0 +1,43 @@
+using ThesisValidator.Rules;
+
+namespace backend.Application.Validation;
+
+public sealed class SectionContextResolver
+{
+    public void PopulateSectionContext(
+        IReadOnlyList<ValidationIssue> results,
+        DocumentContent content)
+    {
+        var headings = content.BodyChildParagraphs
+            .Where(paragraph => paragraph.HeadingLevel is not null)
+            .Select(paragraph => (paragraph.BodyIndex, paragraph.Text))
+            .ToList();
+
+        foreach (var result in results)
+        {
+            var paragraphIndex = result.Location?.Paragraph ?? 0;
+            if (paragraphIndex <= 0)
+                continue;
+
+            var section = FindNearestSection(headings, paragraphIndex);
+            if (section is not null)
+                result.Location!.Section = section;
+        }
+    }
+
+    private static string? FindNearestSection(
+        List<(int Index, string Text)> headings,
+        int paragraphIndex)
+    {
+        string? nearest = null;
+        foreach (var (index, text) in headings)
+        {
+            if (index <= paragraphIndex)
+                nearest = text;
+            else
+                break;
+        }
+
+        return nearest;
+    }
+}
diff --git a/src/backend/Application/Validation/ThesisValidator.cs b/src/backend/Application/Validation/ThesisValidator.cs
new file mode 100644
index 0000000..ab9b0ba
--- /dev/null
+++ b/src/backend/Application/Validation/ThesisValidator.cs
@@ -0,0 +1,83 @@
+using backend.DocumentProcessing.Documents;
+using backend.DocumentProcessing.Content;
+using backend.Annotation;
+using ThesisValidator.Rules;
+
+namespace backend.Application.Validation;
+
+public sealed class ThesisValidator
+{
+    private readonly DocumentSession _documentSession;
+    private readonly DocumentContentAnalyzer _contentAnalyzer;
+    private readonly RuleRunner _ruleRunner;
+    private readonly SectionContextResolver _sectionContextService;
+    private readonly AnnotationApplicator _annotationApplier;
+
+    public ThesisValidator(
+        DocumentSession documentSession,
+        DocumentContentAnalyzer contentAnalyzer,
+        RuleRunner ruleRunner,
+        SectionContextResolver sectionContextService,
+        AnnotationApplicator annotationApplier)
+    {
+        _documentSession = documentSession;
+        _contentAnalyzer = contentAnalyzer;
+        _ruleRunner = ruleRunner;
+        _sectionContextService = sectionContextService;
+        _annotationApplier = annotationApplier;
+    }
+
+    public IReadOnlyList<AvailableValidationRule> GetAvailableRules()
+    {
+        return _ruleRunner.GetAvailableRules();
+    }
+
+    public IReadOnlyList<string> GetUnknownRuleNames(IEnumerable<string> selectedRules)
+    {
+        return _ruleRunner.GetUnknownRuleNames(selectedRules);
+    }
+
+    public IReadOnlyList<ValidationIssue> Validate(
+        Stream fileStream,
+        IEnumerable<string>? selectedRules = null)
+    {
+        using var document = _documentSession.OpenRead(fileStream);
+        return ValidateOpenDocument(document, selectedRules)
+            .Select(execution => execution.Result)
+            .ToList();
+    }
+
+    public (IReadOnlyList<ValidationIssue> Results, MemoryStream AnnotatedDocument) ValidateWithComments(
+        Stream fileStream,
+        IEnumerable<string>? selectedRules = null)
+    {
+        using var editableDocument = _documentSession.OpenEditableCopy(fileStream);
+        var executions = ValidateOpenDocument(editableDocument.Document, selectedRules);
+
+        _annotationApplier.Apply(editableDocument.Document, executions);
+
+        return (
+            executions.Select(execution => execution.Result).ToList(),
+            _documentSession.SaveAnnotated(editableDocument.Document));
+    }
+
+    private IReadOnlyList<RuleExecution> ValidateOpenDocument(
+        DocumentFormat.OpenXml.Packaging.WordprocessingDocument document,
+        IEnumerable<string>? selectedRules)
+    {
+        var content = _contentAnalyzer.Analyze(document);
+        var context = new RuleContext
+        {
+            RawDocument = document,
+            Content = content
+        };
+
+        var executions = _ruleRunner.Run(context, selectedRules);
+        var results = executions
+            .Select(execution => execution.Result)
+            .ToList();
+
+        _sectionContextService.PopulateSectionContext(results, content);
+        return executions;
+    }
+}
diff --git a/src/backend/Application/Validation/ValidationIssue.cs b/src/backend/Application/Validation/ValidationIssue.cs
new file mode 100644
index 0000000..e65f9e2
--- /dev/null
+++ b/src/backend/Application/Validation/ValidationIssue.cs
@@ -0,0 +1,20 @@
+using ThesisValidator.Rules;
+
+namespace backend.Application.Validation;
+
+public sealed class ValidationIssue
+{
+    public string RuleName { get; set; } = string.Empty;
+
+    public string Message { get; set; } = string.Empty;
+
+    public RuleSeverity Severity { get; set; } = RuleSeverity.Error;
+
+    public bool IsError => Severity == RuleSeverity.Error;
+
+    public string? Category { get; set; }
+
+    public ParagraphIndexKind ParagraphIndexKind { get; set; } = ParagraphIndexKind.Descendant;
+
+    public DocumentLocation Location { get; set; } = new();
+}
diff --git a/src/backend/Application/Validation/ValidationIssueComposer.cs b/src/backend/Application/Validation/ValidationIssueComposer.cs
new file mode 100644
index 0000000..43cbcc6
--- /dev/null
+++ b/src/backend/Application/Validation/ValidationIssueComposer.cs
@@ -0,0 +1,22 @@
+using ThesisValidator.Rules;
+
+namespace backend.Application.Validation;
+
+public sealed class ValidationIssueComposer
+{
+    public ValidationIssue Compose(
+        RuleDescriptor descriptor,
+        RulePolicy policy,
+        RuleProblem problem)
+    {
+        return new ValidationIssue
+        {
+            RuleName = descriptor.Name,
+            Message = problem.Message,
+            Category = descriptor.Category,
+            Severity = policy.Severity,
+            ParagraphIndexKind = problem.ParagraphIndexKind,
+            Location = problem.Location
+        };
+    }
+}
diff --git a/backend/Services/CodeBlocks/CodeBlockDetectionOptions.cs b/src/backend/DocumentProcessing/CodeBlocks/CodeBlockDetectionOptions.cs
similarity index 92%
rename from backend/Services/CodeBlocks/CodeBlockDetectionOptions.cs
rename to src/backend/DocumentProcessing/CodeBlocks/CodeBlockDetectionOptions.cs
index eaec670..81f1c53 100644
--- a/backend/Services/CodeBlocks/CodeBlockDetectionOptions.cs
+++ b/src/backend/DocumentProcessing/CodeBlocks/CodeBlockDetectionOptions.cs
@@ -1,4 +1,4 @@
-namespace backend.Services.CodeBlocks;
+namespace backend.DocumentProcessing.CodeBlocks;
 
 public sealed class CodeBlockDetectionOptions
 {
diff --git a/backend/Services/CodeBlocks/CodeBlockDetectionResult.cs b/src/backend/DocumentProcessing/CodeBlocks/CodeBlockDetectionResult.cs
similarity index 88%
rename from backend/Services/CodeBlocks/CodeBlockDetectionResult.cs
rename to src/backend/DocumentProcessing/CodeBlocks/CodeBlockDetectionResult.cs
index 050aeae..b347c5c 100644
--- a/backend/Services/CodeBlocks/CodeBlockDetectionResult.cs
+++ b/src/backend/DocumentProcessing/CodeBlocks/CodeBlockDetectionResult.cs
@@ -1,4 +1,4 @@
-namespace backend.Services.CodeBlocks;
+namespace backend.DocumentProcessing.CodeBlocks;
 
 public sealed class CodeBlockDetectionResult
 {
diff --git a/backend/Services/CodeBlocks/CodeBlockDetector.cs b/src/backend/DocumentProcessing/CodeBlocks/CodeBlockDetector.cs
similarity index 99%
rename from backend/Services/CodeBlocks/CodeBlockDetector.cs
rename to src/backend/DocumentProcessing/CodeBlocks/CodeBlockDetector.cs
index 7bc71a3..b7c5a62 100644
--- a/backend/Services/CodeBlocks/CodeBlockDetector.cs
+++ b/src/backend/DocumentProcessing/CodeBlocks/CodeBlockDetector.cs
@@ -2,7 +2,7 @@
 using DocumentFormat.OpenXml.Wordprocessing;
 using Microsoft.Extensions.Options;
 
-namespace backend.Services.CodeBlocks;
+namespace backend.DocumentProcessing.CodeBlocks;
 
 public sealed class CodeBlockDetector : ICodeBlockDetector
 {
diff --git a/backend/Services/CodeBlocks/CodeBlockRuleSkipper.cs b/src/backend/DocumentProcessing/CodeBlocks/CodeBlockRuleSkipper.cs
similarity index 88%
rename from backend/Services/CodeBlocks/CodeBlockRuleSkipper.cs
rename to src/backend/DocumentProcessing/CodeBlocks/CodeBlockRuleSkipper.cs
index 06ffcf2..e04073f 100644
--- a/backend/Services/CodeBlocks/CodeBlockRuleSkipper.cs
+++ b/src/backend/DocumentProcessing/CodeBlocks/CodeBlockRuleSkipper.cs
@@ -1,7 +1,7 @@
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
 
-namespace backend.Services.CodeBlocks;
+namespace backend.DocumentProcessing.CodeBlocks;
 
 public static class CodeBlockRuleSkipper
 {
diff --git a/backend/Services/CodeBlocks/ICodeBlockDetector.cs b/src/backend/DocumentProcessing/CodeBlocks/ICodeBlockDetector.cs
similarity index 85%
rename from backend/Services/CodeBlocks/ICodeBlockDetector.cs
rename to src/backend/DocumentProcessing/CodeBlocks/ICodeBlockDetector.cs
index edec36d..078b44f 100644
--- a/backend/Services/CodeBlocks/ICodeBlockDetector.cs
+++ b/src/backend/DocumentProcessing/CodeBlocks/ICodeBlockDetector.cs
@@ -1,7 +1,7 @@
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
 
-namespace backend.Services.CodeBlocks;
+namespace backend.DocumentProcessing.CodeBlocks;
 
 public interface ICodeBlockDetector
 {
diff --git a/src/backend/DocumentProcessing/Content/DocumentContentAnalyzer.cs b/src/backend/DocumentProcessing/Content/DocumentContentAnalyzer.cs
new file mode 100644
index 0000000..37c00f3
--- /dev/null
+++ b/src/backend/DocumentProcessing/Content/DocumentContentAnalyzer.cs
@@ -0,0 +1,117 @@
+using backend.DocumentProcessing.Context;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Figures;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+using Microsoft.Extensions.Options;
+using ThesisValidator.Rules;
+
+namespace backend.DocumentProcessing.Content;
+
+public sealed class DocumentContentAnalyzer
+{
+    private readonly DocumentSkipResolver _skipService;
+
+    public DocumentContentAnalyzer(DocumentSkipResolver? skipService = null)
+    {
+        _skipService = skipService
+            ?? new DocumentSkipResolver(Options.Create(new ValidationSkippingOptions()));
+    }
+
+    public DocumentContent Analyze(WordprocessingDocument doc)
+    {
+        var body = doc.MainDocumentPart?.Document.Body;
+        if (body is null)
+            return new DocumentContent();
+
+        var paragraphs = new List<ParagraphNode>();
+        var rootSections = new List<SectionNode>();
+        var sectionStack = new List<SectionNode>();
+
+        var firstIncludedChildIndex = _skipService.GetFirstIncludedBodyChildIndex(doc);
+        var tocParagraphs = _skipService.GetSkippedTableOfContentsParagraphs(doc);
+
+        var paragraphIndex = 0;
+        var childIndex = 0;
+
+        foreach (var element in body.ChildElements)
+        {
+            if (element is Paragraph)
+                paragraphIndex++;
+
+            if (childIndex++ < firstIncludedChildIndex)
+                continue;
+
+            if (element is not Paragraph paragraph)
+            {
+                MarkIntroductoryContent(sectionStack);
+                continue;
+            }
+
+            if (_skipService.ShouldSkipParagraph(paragraph, tocParagraphs))
+                continue;
+
+            var text = TextExtractor.GetParagraphText(
+                paragraph,
+                _skipService.SkipTextBoxes).Trim();
+            var headingLevel = HeadingDetection.GetHeadingLevel(doc, paragraph);
+            var paragraphNode = new ParagraphNode
+            {
+                Paragraph = paragraph,
+                BodyIndex = paragraphIndex,
+                Text = text,
+                HeadingLevel = headingLevel
+            };
+            paragraphs.Add(paragraphNode);
+
+            if (headingLevel is not null)
+            {
+                AddSection(paragraphNode, rootSections, sectionStack);
+                continue;
+            }
+
+            if (!string.IsNullOrWhiteSpace(text))
+                MarkIntroductoryContent(sectionStack);
+        }
+
+        return new DocumentContent
+        {
+            BodyChildParagraphs = paragraphs,
+            Sections = rootSections
+        };
+    }
+
+    private static void AddSection(
+        ParagraphNode heading,
+        List<SectionNode> rootSections,
+        List<SectionNode> sectionStack)
+    {
+        var level = heading.HeadingLevel!.Value;
+        while (sectionStack.Count > 0 && sectionStack[^1].Level >= level)
+        {
+            sectionStack.RemoveAt(sectionStack.Count - 1);
+        }
+
+        var section = new SectionNode { Heading = heading };
+        if (sectionStack.Count == 0)
+        {
+            rootSections.Add(section);
+        }
+        else
+        {
+            sectionStack[^1].Children.Add(section);
+        }
+
+        sectionStack.Add(section);
+    }
+
+    private static void MarkIntroductoryContent(List<SectionNode> sectionStack)
+    {
+        if (sectionStack.Count == 0)
+            return;
+
+        var currentSection = sectionStack[^1];
+        if (currentSection.Children.Count == 0)
+            currentSection.HasIntroductoryContent = true;
+    }
+}
diff --git a/backend/Services/Extraction/TextExtractionService.cs b/src/backend/DocumentProcessing/Content/TextExtractor.cs
similarity index 55%
rename from backend/Services/Extraction/TextExtractionService.cs
rename to src/backend/DocumentProcessing/Content/TextExtractor.cs
index 605fe8f..1883251 100644
--- a/backend/Services/Extraction/TextExtractionService.cs
+++ b/src/backend/DocumentProcessing/Content/TextExtractor.cs
@@ -1,52 +1,41 @@
 using System.Globalization;
 using System.Text;
-using Backend.Models;
+using backend.DocumentProcessing.Skipping;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
-using backend.Services.Skipping;
 
-namespace backend.Services.Extraction;
+namespace backend.DocumentProcessing.Content;
 
-public static class TextExtractionService
+public static class TextExtractor
 {
-    public static string GetParagraphText(
-        WordprocessingDocument doc,
-        Paragraph paragraph,
-        UniversityConfig config)
-    {
-        return GetParagraphText(paragraph, config);
-    }
-
-    public static string GetParagraphText(Paragraph paragraph, UniversityConfig config)
-    {
-        return GetParagraphText(paragraph, SkipDecisionService.ShouldSkipTextBoxes(config));
-    }
-
     public static string GetParagraphText(Paragraph paragraph, bool skipTextBoxes)
     {
         var textElements = paragraph.Descendants<Text>();
         if (skipTextBoxes)
         {
-            textElements = textElements.Where(text => !TextBoxSkipRule.IsInsideTextBoxOrDrawingText(text));
+            textElements = textElements.Where(text => !TextBoxContentDetector.IsInsideTextBoxOrDrawingText(text));
         }
 
-        return string.Concat(textElements.Select(t => t.Text));
+        return string.Concat(textElements.Select(text => text.Text));
+    }
+
+    public static string GetParagraphText(
+        WordprocessingDocument document,
+        Paragraph paragraph,
+        bool skipTextBoxes)
+    {
+        return GetParagraphText(paragraph, skipTextBoxes);
     }
 
-    public static string GetRunText(Run run, UniversityConfig config)
+    public static string GetRunText(Run run, bool skipTextBoxes = true)
     {
         var textElements = run.Elements<Text>();
-        if (SkipDecisionService.ShouldSkipTextBoxes(config))
+        if (skipTextBoxes)
         {
-            textElements = textElements.Where(text => !TextBoxSkipRule.IsInsideTextBoxOrDrawingText(text));
+            textElements = textElements.Where(text => !TextBoxContentDetector.IsInsideTextBoxOrDrawingText(text));
         }
 
-        return string.Concat(textElements.Select(t => t.Text));
-    }
-
-    public static bool HasMeaningfulParagraphContent(Paragraph paragraph, UniversityConfig config)
-    {
-        return HasMeaningfulContent(GetParagraphText(paragraph, config));
+        return string.Concat(textElements.Select(text => text.Text));
     }
 
     public static bool HasMeaningfulContent(string? text)
@@ -68,14 +57,18 @@ public static bool HasMeaningfulContent(string? text)
         return false;
     }
 
-    public static string GetPreview(Paragraph paragraph, UniversityConfig config, int maxLength)
+    public static string GetPreview(Paragraph paragraph, bool skipTextBoxes, int maxLength)
     {
-        return Truncate(SanitizePreview(GetParagraphText(paragraph, config)), maxLength);
+        return Truncate(SanitizePreview(GetParagraphText(paragraph, skipTextBoxes)), maxLength);
     }
 
-    public static string GetPreview(WordprocessingDocument doc, Paragraph paragraph, UniversityConfig config, int maxLength)
+    public static string GetPreview(
+        WordprocessingDocument document,
+        Paragraph paragraph,
+        bool skipTextBoxes,
+        int maxLength)
     {
-        return Truncate(SanitizePreview(GetParagraphText(doc, paragraph, config)), maxLength);
+        return Truncate(SanitizePreview(GetParagraphText(document, paragraph, skipTextBoxes)), maxLength);
     }
 
     public static string Truncate(string text, int maxLength)
diff --git a/src/backend/DocumentProcessing/Context/DocumentSkipResolver.cs b/src/backend/DocumentProcessing/Context/DocumentSkipResolver.cs
new file mode 100644
index 0000000..f1d33c3
--- /dev/null
+++ b/src/backend/DocumentProcessing/Context/DocumentSkipResolver.cs
@@ -0,0 +1,145 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Skipping;
+using backend.DocumentProcessing.Figures;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+using Microsoft.Extensions.Options;
+
+namespace backend.DocumentProcessing.Context;
+
+public sealed class DocumentSkipResolver
+{
+    private readonly ValidationSkippingOptions _options;
+
+    public DocumentSkipResolver(IOptions<ValidationSkippingOptions> options)
+    {
+        _options = options.Value;
+    }
+
+    public bool SkipTextBoxes => _options.SkipTextBoxes;
+
+    public int GetFirstIncludedBodyChildIndex(
+        WordprocessingDocument doc)
+    {
+        if (!_options.SkipBeforeTableOfContents)
+            return 0;
+
+        var body = doc.MainDocumentPart?.Document.Body;
+        if (body is null)
+            return 0;
+
+        var tocParagraph = TableOfContentsDetector.Detect(doc).Paragraph;
+        if (tocParagraph is null)
+            return 0;
+
+        var tocBodyChild = GetBodyChildAncestor(tocParagraph, body);
+        if (tocBodyChild is null)
+            return 0;
+
+        var childIndex = 0;
+        foreach (var child in body.ChildElements)
+        {
+            if (ReferenceEquals(child, tocBodyChild))
+                return childIndex + 1;
+
+            childIndex++;
+        }
+
+        return 0;
+    }
+
+    public HashSet<Paragraph> GetSkippedTableOfContentsParagraphs(
+        WordprocessingDocument doc)
+    {
+        var paragraphs = new HashSet<Paragraph>();
+        if (!_options.SkipTableOfContentsContent)
+            return paragraphs;
+
+        var body = doc.MainDocumentPart?.Document.Body;
+        if (body is null)
+            return paragraphs;
+
+        var inTocField = false;
+        foreach (var paragraph in body.Descendants<Paragraph>())
+        {
+            if (TableOfContentsDetector.ContainsTocFieldCode(paragraph))
+            {
+                inTocField = true;
+                paragraphs.Add(paragraph);
+            }
+
+            if (inTocField)
+            {
+                paragraphs.Add(paragraph);
+            }
+            else if (IsTocStyleParagraph(paragraph))
+            {
+                paragraphs.Add(paragraph);
+            }
+
+            if (inTocField && ContainsFieldEnd(paragraph))
+            {
+                inTocField = false;
+            }
+        }
+
+        return paragraphs;
+    }
+
+    public bool ShouldSkipParagraph(
+        Paragraph paragraph,
+        IReadOnlySet<Paragraph> tableOfContentsParagraphs)
+    {
+        if (tableOfContentsParagraphs.Contains(paragraph))
+            return true;
+
+        return _options.SkipTextBoxes
+            && (TextBoxContentDetector.IsInsideTextBoxOrDrawingText(paragraph)
+                || IsTextBoxOnlyParagraph(paragraph));
+    }
+
+    private static bool IsTextBoxOnlyParagraph(Paragraph paragraph)
+    {
+        return paragraph.Descendants<Text>().Any(TextBoxContentDetector.IsInsideTextBoxOrDrawingText)
+            && !TextExtractor.HasMeaningfulContent(GetParagraphTextWithoutTextBoxes(paragraph));
+    }
+
+    private static string GetParagraphTextWithoutTextBoxes(Paragraph paragraph)
+    {
+        return string.Concat(paragraph
+            .Descendants<Text>()
+            .Where(text => !TextBoxContentDetector.IsInsideTextBoxOrDrawingText(text))
+            .Select(text => text.Text));
+    }
+
+    private static bool IsTocStyleParagraph(Paragraph paragraph)
+    {
+        var styleId = paragraph.ParagraphProperties?.ParagraphStyleId?.Val?.Value;
+        if (string.IsNullOrWhiteSpace(styleId))
+            return false;
+
+        var normalized = styleId.Replace(" ", "", StringComparison.OrdinalIgnoreCase);
+        return normalized.StartsWith("TOC", StringComparison.OrdinalIgnoreCase)
+            || normalized.StartsWith("Spis", StringComparison.OrdinalIgnoreCase)
+            || normalized.Contains("TableOfContents", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static bool ContainsFieldEnd(Paragraph paragraph)
+    {
+        return paragraph.Descendants<FieldChar>()
+            .Any(fieldChar => fieldChar.FieldCharType?.Value == FieldCharValues.End);
+    }
+
+    private static OpenXmlElement? GetBodyChildAncestor(OpenXmlElement element, Body body)
+    {
+        OpenXmlElement? current = element;
+        while (current?.Parent is not null && current.Parent != body)
+        {
+            current = current.Parent;
+        }
+
+        return current?.Parent == body ? current : null;
+    }
+}
diff --git a/backend/Services/Structure/HeadingDetectionService.cs b/src/backend/DocumentProcessing/Context/HeadingDetection.cs
similarity index 81%
rename from backend/Services/Structure/HeadingDetectionService.cs
rename to src/backend/DocumentProcessing/Context/HeadingDetection.cs
index f52db81..20e4178 100644
--- a/backend/Services/Structure/HeadingDetectionService.cs
+++ b/src/backend/DocumentProcessing/Context/HeadingDetection.cs
@@ -1,9 +1,9 @@
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
 
-namespace backend.Services.Structure;
+namespace backend.DocumentProcessing.Context;
 
-public static class HeadingDetectionService
+public static class HeadingDetection
 {
     private static readonly string[] NonHeadingPatterns =
     [
@@ -18,7 +18,7 @@ public static class HeadingDetectionService
         "listparagraph"
     ];
 
-    public static int? GetHeadingLevel(WordprocessingDocument doc, Paragraph paragraph)
+    public static int? GetHeadingLevel(WordprocessingDocument document, Paragraph paragraph)
     {
         var styleId = paragraph.ParagraphProperties?.ParagraphStyleId?.Val?.Value;
         if (string.IsNullOrEmpty(styleId))
@@ -28,12 +28,12 @@ public static class HeadingDetectionService
             return null;
 
         var levelFromId = ParseLevelFromStyleId(styleId);
-        return levelFromId ?? GetOutlineLevelFromStyle(doc, styleId);
+        return levelFromId ?? GetOutlineLevelFromStyle(document, styleId);
     }
 
-    public static bool IsHeading(WordprocessingDocument doc, Paragraph paragraph)
+    public static bool IsHeading(WordprocessingDocument document, Paragraph paragraph)
     {
-        return GetHeadingLevel(doc, paragraph) is not null;
+        return GetHeadingLevel(document, paragraph) is not null;
     }
 
     private static bool IsNonHeadingStyle(string styleId)
@@ -44,9 +44,11 @@ private static bool IsNonHeadingStyle(string styleId)
 
     private static int? ParseLevelFromStyleId(string styleId)
     {
-        int digitStart = styleId.Length;
+        var digitStart = styleId.Length;
         while (digitStart > 0 && char.IsAsciiDigit(styleId[digitStart - 1]))
+        {
             digitStart--;
+        }
 
         if (digitStart == styleId.Length)
             return null;
@@ -74,9 +76,9 @@ private static bool IsKnownHeadingPrefix(string prefix)
             "titolo";
     }
 
-    private static int? GetOutlineLevelFromStyle(WordprocessingDocument doc, string styleId)
+    private static int? GetOutlineLevelFromStyle(WordprocessingDocument document, string styleId)
     {
-        var styles = doc.MainDocumentPart?.StyleDefinitionsPart?.Styles;
+        var styles = document.MainDocumentPart?.StyleDefinitionsPart?.Styles;
         if (styles is null)
             return null;
 
@@ -91,7 +93,7 @@ private static bool IsKnownHeadingPrefix(string prefix)
 
         var basedOn = style.BasedOn?.Val?.Value;
         if (!string.IsNullOrEmpty(basedOn) && !string.Equals(basedOn, styleId, StringComparison.OrdinalIgnoreCase))
-            return GetOutlineLevelFromStyle(doc, basedOn);
+            return GetOutlineLevelFromStyle(document, basedOn);
 
         return null;
     }
diff --git a/src/backend/DocumentProcessing/Context/ValidationSkippingOptions.cs b/src/backend/DocumentProcessing/Context/ValidationSkippingOptions.cs
new file mode 100644
index 0000000..d75330d
--- /dev/null
+++ b/src/backend/DocumentProcessing/Context/ValidationSkippingOptions.cs
@@ -0,0 +1,12 @@
+namespace backend.DocumentProcessing.Context;
+
+public sealed class ValidationSkippingOptions
+{
+    public const string SectionName = "Validation:Skipping";
+
+    public bool SkipBeforeTableOfContents { get; init; }
+
+    public bool SkipTextBoxes { get; init; } = true;
+
+    public bool SkipTableOfContentsContent { get; init; } = true;
+}
diff --git a/src/backend/DocumentProcessing/Documents/DocumentSession.cs b/src/backend/DocumentProcessing/Documents/DocumentSession.cs
new file mode 100644
index 0000000..a4234e5
--- /dev/null
+++ b/src/backend/DocumentProcessing/Documents/DocumentSession.cs
@@ -0,0 +1,75 @@
+using backend.Annotation;
+using DocumentFormat.OpenXml.Packaging;
+
+namespace backend.DocumentProcessing.Documents;
+
+public sealed class DocumentSession
+{
+    public WordprocessingDocument OpenRead(Stream stream)
+    {
+        return OpenDocument(stream, isEditable: false);
+    }
+
+    public EditableDocument OpenEditableCopy(Stream stream)
+    {
+        var memoryStream = new MemoryStream();
+        stream.CopyTo(memoryStream);
+        memoryStream.Position = 0;
+
+        var document = OpenDocument(memoryStream, isEditable: true);
+        return new EditableDocument(document, memoryStream);
+    }
+
+    public MemoryStream SaveAnnotated(WordprocessingDocument document)
+    {
+        try
+        {
+            document.MainDocumentPart?.Document.Save();
+            return CommentWriter.SaveDocumentWithComments(document);
+        }
+        catch (Exception ex) when (IsDocumentProcessingException(ex))
+        {
+            throw new InvalidThesisDocumentException(
+                "The uploaded file could not be saved as an annotated DOCX document.",
+                ex);
+        }
+    }
+
+    private static WordprocessingDocument OpenDocument(Stream stream, bool isEditable)
+    {
+        try
+        {
+            var document = WordprocessingDocument.Open(stream, isEditable);
+            if (document.MainDocumentPart?.Document is not null)
+            {
+                return document;
+            }
+
+            document.Dispose();
+            throw new InvalidThesisDocumentException(
+                "The uploaded file is not a valid Wordprocessing document.");
+        }
+        catch (InvalidThesisDocumentException)
+        {
+            throw;
+        }
+        catch (Exception ex) when (IsDocumentProcessingException(ex))
+        {
+            throw new InvalidThesisDocumentException(
+                "The uploaded file could not be opened as a DOCX document.",
+                ex);
+        }
+    }
+
+    private static bool IsDocumentProcessingException(Exception exception)
+    {
+        return exception is OpenXmlPackageException
+            or FileFormatException
+            or InvalidDataException
+            or IOException
+            or NotSupportedException
+            or InvalidOperationException
+            or ArgumentException
+            or ObjectDisposedException;
+    }
+}
diff --git a/src/backend/DocumentProcessing/Documents/EditableDocument.cs b/src/backend/DocumentProcessing/Documents/EditableDocument.cs
new file mode 100644
index 0000000..6751c88
--- /dev/null
+++ b/src/backend/DocumentProcessing/Documents/EditableDocument.cs
@@ -0,0 +1,24 @@
+using DocumentFormat.OpenXml.Packaging;
+
+namespace backend.DocumentProcessing.Documents;
+
+public sealed class EditableDocument : IDisposable
+{
+    private readonly MemoryStream _stream;
+
+    public EditableDocument(
+        WordprocessingDocument document,
+        MemoryStream stream)
+    {
+        Document = document;
+        _stream = stream;
+    }
+
+    public WordprocessingDocument Document { get; }
+
+    public void Dispose()
+    {
+        Document.Dispose();
+        _stream.Dispose();
+    }
+}
diff --git a/backend/Services/Exceptions/InvalidThesisDocumentException.cs b/src/backend/DocumentProcessing/Documents/InvalidThesisDocumentException.cs
similarity index 53%
rename from backend/Services/Exceptions/InvalidThesisDocumentException.cs
rename to src/backend/DocumentProcessing/Documents/InvalidThesisDocumentException.cs
index 112703c..cda3511 100644
--- a/backend/Services/Exceptions/InvalidThesisDocumentException.cs
+++ b/src/backend/DocumentProcessing/Documents/InvalidThesisDocumentException.cs
@@ -1,8 +1,13 @@
-namespace backend.Services.Exceptions;
+namespace backend.DocumentProcessing.Documents;
 
 public sealed class InvalidThesisDocumentException : Exception
 {
-    public InvalidThesisDocumentException(string message, Exception? innerException = null)
+    public InvalidThesisDocumentException(string message)
+        : base(message)
+    {
+    }
+
+    public InvalidThesisDocumentException(string message, Exception innerException)
         : base(message, innerException)
     {
     }
diff --git a/backend/Services/Structure/CaptionDetectionService.cs b/src/backend/DocumentProcessing/Figures/CaptionDetection.cs
similarity index 72%
rename from backend/Services/Structure/CaptionDetectionService.cs
rename to src/backend/DocumentProcessing/Figures/CaptionDetection.cs
index 53eb0b2..637c5f5 100644
--- a/backend/Services/Structure/CaptionDetectionService.cs
+++ b/src/backend/DocumentProcessing/Figures/CaptionDetection.cs
@@ -1,13 +1,11 @@
-using backend.Services.Extraction;
-using backend.Services.Formatting;
-using Backend.Models;
+using System.Text.RegularExpressions;
+using backend.DocumentProcessing.Formatting;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
-using System.Text.RegularExpressions;
 
-namespace backend.Services.Structure;
+namespace backend.DocumentProcessing.Figures;
 
-public static class CaptionDetectionService
+public static class CaptionDetection
 {
     private static readonly Regex ValidFigureCaptionRegex = new(
         @"^\s*(?:Rys(?:\.|unek)?|Figure|Fig\.?)\s+\d+(?:\.\d+)*(?:(?:\s*(?::|-|\u2013|\.)\s+\S.*)|(?:\s+\S.*)|\.)?\s*$",
@@ -27,27 +25,27 @@ public static class CaptionDetectionService
 
     public static bool UsesDedicatedCaptionStyle(Paragraph paragraph)
     {
-        var styleId = StyleResolutionService.GetParagraphStyleId(paragraph);
+        var styleId = StyleResolver.GetParagraphStyleId(paragraph);
         return IsCaptionStyleLabel(styleId);
     }
 
-    public static bool UsesDedicatedCaptionStyle(WordprocessingDocument doc, Paragraph paragraph)
+    public static bool UsesDedicatedCaptionStyle(WordprocessingDocument document, Paragraph paragraph)
     {
-        var styleId = StyleResolutionService.GetParagraphStyleId(paragraph);
-        var styleName = StyleResolutionService.GetStyleName(doc, styleId);
+        var styleId = StyleResolver.GetParagraphStyleId(paragraph);
+        var styleName = StyleResolver.GetStyleName(document, styleId);
 
         return IsCaptionStyleLabel(styleId) || IsCaptionStyleLabel(styleName);
     }
 
     public static string GetCaptionStyleLabel(Paragraph paragraph)
     {
-        return StyleResolutionService.GetParagraphStyleId(paragraph) ?? "Normal";
+        return StyleResolver.GetParagraphStyleId(paragraph) ?? "Normal";
     }
 
-    public static string GetCaptionStyleLabel(WordprocessingDocument doc, Paragraph paragraph)
+    public static string GetCaptionStyleLabel(WordprocessingDocument document, Paragraph paragraph)
     {
-        var styleId = StyleResolutionService.GetParagraphStyleId(paragraph);
-        var styleName = StyleResolutionService.GetStyleName(doc, styleId);
+        var styleId = StyleResolver.GetParagraphStyleId(paragraph);
+        var styleName = StyleResolver.GetStyleName(document, styleId);
 
         if (string.IsNullOrWhiteSpace(styleId))
             return "Normal";
@@ -57,12 +55,6 @@ public static string GetCaptionStyleLabel(WordprocessingDocument doc, Paragraph
             : $"{styleId} ({styleName})";
     }
 
-    public static Run? GetFirstTextRun(Paragraph paragraph, UniversityConfig config)
-    {
-        return paragraph.Elements<Run>()
-            .FirstOrDefault(run => !string.IsNullOrWhiteSpace(TextExtractionService.GetRunText(run, config)));
-    }
-
     public static bool HasValidFigureCaptionFormat(string text)
     {
         return ValidFigureCaptionRegex.IsMatch(text);
@@ -74,19 +66,6 @@ public static bool LooksLikeFigureCaptionText(string text)
             || FigureCaptionAttemptRegex.IsMatch(text);
     }
 
-    public static bool IsFigureCaptionCandidate(
-        WordprocessingDocument doc,
-        Paragraph paragraph,
-        UniversityConfig config)
-    {
-        var text = TextExtractionService.GetParagraphText(doc, paragraph, config).Trim();
-        var hasMeaningfulText = TextExtractionService.HasMeaningfulContent(text);
-
-        return HasFigureSequenceField(paragraph)
-            || (hasMeaningfulText && LooksLikeFigureCaptionText(text))
-            || (hasMeaningfulText && UsesDedicatedCaptionStyle(doc, paragraph));
-    }
-
     public static bool HasFigureSequenceField(Paragraph paragraph)
     {
         var simpleFieldInstructions = paragraph
diff --git a/src/backend/DocumentProcessing/Figures/FigureCaptionAnalyzer.cs b/src/backend/DocumentProcessing/Figures/FigureCaptionAnalyzer.cs
new file mode 100644
index 0000000..a88f095
--- /dev/null
+++ b/src/backend/DocumentProcessing/Figures/FigureCaptionAnalyzer.cs
@@ -0,0 +1,137 @@
+using backend.DocumentProcessing.Figures;
+using ThesisValidator.Rules;
+
+namespace backend.DocumentProcessing.Figures;
+
+public sealed class FigureCaptionAnalyzer
+{
+    private const int MaxFollowingParagraphs = 4;
+    private const int MaxPreviousParagraphs = 2;
+
+    public IReadOnlyList<FigureCaptionAssociation> AssociateFiguresWithCaptions(
+        RuleContext context,
+        bool requireStructuredCaption = false)
+    {
+        var paragraphs = context.Content.BodyChildParagraphs;
+        var associations = new List<FigureCaptionAssociation>();
+
+        for (var i = 0; i < paragraphs.Count; i++)
+        {
+            var paragraph = paragraphs[i];
+            if (!FigureDetection.ContainsFigureCandidate(paragraph.Paragraph))
+                continue;
+
+            var figure = new FigureCandidate(paragraph.Paragraph, paragraph.BodyIndex);
+            var below = FindFollowingCaption(context, paragraphs, i, requireStructuredCaption);
+            if (below is not null)
+            {
+                associations.Add(new FigureCaptionAssociation(figure, below.Value.Caption, below.Value.Relation));
+                continue;
+            }
+
+            var above = FindPreviousCaption(context, paragraphs, i, requireStructuredCaption);
+            associations.Add(above is null
+                ? new FigureCaptionAssociation(figure, null, FigureCaptionRelationKind.None)
+                : new FigureCaptionAssociation(figure, above, FigureCaptionRelationKind.Above));
+        }
+
+        return associations;
+    }
+
+    public IReadOnlyList<FigureCaptionCandidate> GetDetectedFigureCaptions(RuleContext context)
+    {
+        return AssociateFiguresWithCaptions(context)
+            .Where(association => association.Caption is not null)
+            .Select(association => association.Caption!)
+            .GroupBy(caption => caption.ParagraphIndex)
+            .Select(group => group.First())
+            .ToList();
+    }
+
+    private static (FigureCaptionCandidate Caption, FigureCaptionRelationKind Relation)? FindFollowingCaption(
+        RuleContext context,
+        IReadOnlyList<ParagraphNode> paragraphs,
+        int figureListIndex,
+        bool requireStructuredCaption)
+    {
+        var hasInterveningContent = false;
+        var end = Math.Min(paragraphs.Count - 1, figureListIndex + MaxFollowingParagraphs);
+
+        for (var i = figureListIndex + 1; i <= end; i++)
+        {
+            var paragraph = paragraphs[i];
+            var hasMeaningfulText = !string.IsNullOrWhiteSpace(paragraph.Text);
+            var containsFigure = FigureDetection.ContainsFigureCandidate(paragraph.Paragraph);
+            var caption = CreateCaptionCandidate(context, paragraph);
+
+            if (caption is not null && (!requireStructuredCaption || caption.IsStructuredCaption))
+            {
+                return (
+                    caption,
+                    hasInterveningContent
+                        ? FigureCaptionRelationKind.SeparatedBelow
+                        : FigureCaptionRelationKind.Below);
+            }
+
+            if (containsFigure)
+                break;
+
+            if (!hasMeaningfulText)
+                continue;
+
+            hasInterveningContent = true;
+        }
+
+        return null;
+    }
+
+    private static FigureCaptionCandidate? FindPreviousCaption(
+        RuleContext context,
+        IReadOnlyList<ParagraphNode> paragraphs,
+        int figureListIndex,
+        bool requireStructuredCaption)
+    {
+        var start = Math.Max(0, figureListIndex - MaxPreviousParagraphs);
+
+        for (var i = figureListIndex - 1; i >= start; i--)
+        {
+            var paragraph = paragraphs[i];
+            var hasMeaningfulText = !string.IsNullOrWhiteSpace(paragraph.Text);
+            var containsFigure = FigureDetection.ContainsFigureCandidate(paragraph.Paragraph);
+            var caption = CreateCaptionCandidate(context, paragraph);
+
+            if (caption is not null && (!requireStructuredCaption || caption.IsStructuredCaption))
+                return caption;
+
+            if (!hasMeaningfulText && !containsFigure)
+                continue;
+
+            break;
+        }
+
+        return null;
+    }
+
+    private static FigureCaptionCandidate? CreateCaptionCandidate(
+        RuleContext context,
+        ParagraphNode paragraph)
+    {
+        var text = paragraph.Text.Trim();
+        var hasMeaningfulText = !string.IsNullOrWhiteSpace(text);
+        var hasFigureSequenceField = CaptionDetection.HasFigureSequenceField(paragraph.Paragraph);
+        var usesDedicatedCaptionStyle = hasMeaningfulText
+            && CaptionDetection.UsesDedicatedCaptionStyle(context.RawDocument, paragraph.Paragraph);
+        var looksLikeFigureCaptionText = hasMeaningfulText
+            && CaptionDetection.LooksLikeFigureCaptionText(text);
+
+        return hasFigureSequenceField || usesDedicatedCaptionStyle || looksLikeFigureCaptionText
+            ? new FigureCaptionCandidate(
+                paragraph.Paragraph,
+                paragraph.BodyIndex,
+                text,
+                hasFigureSequenceField,
+                usesDedicatedCaptionStyle,
+                looksLikeFigureCaptionText)
+            : null;
+    }
+}
diff --git a/src/backend/DocumentProcessing/Figures/FigureCaptionAssociation.cs b/src/backend/DocumentProcessing/Figures/FigureCaptionAssociation.cs
new file mode 100644
index 0000000..d8176d9
--- /dev/null
+++ b/src/backend/DocumentProcessing/Figures/FigureCaptionAssociation.cs
@@ -0,0 +1,33 @@
+using DocumentFormat.OpenXml.Wordprocessing;
+
+namespace backend.DocumentProcessing.Figures;
+
+public enum FigureCaptionRelationKind
+{
+    None,
+    Below,
+    Above,
+    SeparatedBelow
+}
+
+public sealed record FigureCandidate(Paragraph Paragraph, int ParagraphIndex);
+
+public sealed record FigureCaptionCandidate(
+    Paragraph Paragraph,
+    int ParagraphIndex,
+    string Text,
+    bool HasFigureSequenceField,
+    bool UsesDedicatedCaptionStyle,
+    bool LooksLikeFigureCaptionText)
+{
+    public bool IsStructuredCaption => HasFigureSequenceField || UsesDedicatedCaptionStyle;
+}
+
+public sealed record FigureCaptionAssociation(
+    FigureCandidate Figure,
+    FigureCaptionCandidate? Caption,
+    FigureCaptionRelationKind Relation)
+{
+    public bool HasCaption => Caption is not null;
+    public bool IsCaptionBelowFigure => Relation == FigureCaptionRelationKind.Below;
+}
diff --git a/backend/Services/Structure/FigureDetectionService.cs b/src/backend/DocumentProcessing/Figures/FigureDetection.cs
similarity index 81%
rename from backend/Services/Structure/FigureDetectionService.cs
rename to src/backend/DocumentProcessing/Figures/FigureDetection.cs
index 46bf496..be880da 100644
--- a/backend/Services/Structure/FigureDetectionService.cs
+++ b/src/backend/DocumentProcessing/Figures/FigureDetection.cs
@@ -1,44 +1,29 @@
-using Backend.Models;
-using backend.Services.Skipping;
+using backend.DocumentProcessing.Skipping;
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Wordprocessing;
 
-namespace backend.Services.Structure;
+namespace backend.DocumentProcessing.Figures;
 
-public static class FigureDetectionService
+public static class FigureDetection
 {
-    public static bool ContainsImage(Paragraph paragraph, UniversityConfig config)
+    public static bool ContainsFigureCandidate(Paragraph paragraph, bool skipTextBoxes = true)
     {
-        return ContainsFigureCandidate(paragraph, config);
-    }
-
-    public static bool ContainsFigureCandidate(Paragraph paragraph, UniversityConfig config)
-    {
-        if (paragraph.Descendants<Drawing>().Any(drawing =>
-                IsFigureObject(drawing, config)))
-        {
-            return true;
-        }
-
-        if (paragraph.Descendants<Picture>().Any(picture =>
-                IsFigureObject(picture, config)))
-        {
+        if (paragraph.Descendants<Drawing>().Any(drawing => IsFigureObject(drawing, skipTextBoxes)))
             return true;
-        }
 
-        return false;
+        return paragraph.Descendants<Picture>().Any(picture => IsFigureObject(picture, skipTextBoxes));
     }
 
-    private static bool IsFigureObject(OpenXmlElement element, UniversityConfig config)
+    private static bool IsFigureObject(OpenXmlElement element, bool skipTextBoxes)
     {
         var hasVisualContent = ContainsVisualFigureContent(element);
         if (!hasVisualContent)
             return false;
 
-        if (!SkipDecisionService.ShouldSkipTextBoxes(config))
+        if (!skipTextBoxes)
             return true;
 
-        return !TextBoxSkipRule.ContainsTextBoxContent(element)
+        return !TextBoxContentDetector.ContainsTextBoxContent(element)
             || ContainsVisualContentOutsideTextBox(element);
     }
 
diff --git a/backend/Services/Formatting/FormattingResolutionService.cs b/src/backend/DocumentProcessing/Formatting/FormattingResolver.cs
similarity index 59%
rename from backend/Services/Formatting/FormattingResolutionService.cs
rename to src/backend/DocumentProcessing/Formatting/FormattingResolver.cs
index 57b9c6b..96dcb6c 100644
--- a/backend/Services/Formatting/FormattingResolutionService.cs
+++ b/src/backend/DocumentProcessing/Formatting/FormattingResolver.cs
@@ -1,13 +1,14 @@
+using backend.DocumentProcessing.Formatting;
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
 
-namespace backend.Services.Formatting;
+namespace backend.DocumentProcessing.Formatting;
 
-public static class FormattingResolutionService
+public sealed class FormattingResolver
 {
-    public static string? ResolveFontFamily(
-        WordprocessingDocument doc,
+    public string? ResolveFontFamily(
+        WordprocessingDocument document,
         Paragraph paragraph,
         Run run)
     {
@@ -15,17 +16,17 @@ public static class FormattingResolutionService
         if (!string.IsNullOrEmpty(runFont))
             return runFont;
 
-        foreach (var style in StyleResolutionService.GetStyleChain(
-                     doc,
-                     StyleResolutionService.GetParagraphStyleId(paragraph)))
+        foreach (var style in StyleResolver.GetStyleChain(
+                     document,
+                     StyleResolver.GetParagraphStyleId(paragraph)))
         {
             var styleFont = style.StyleRunProperties?.RunFonts?.Ascii?.Value;
             if (!string.IsNullOrEmpty(styleFont))
                 return styleFont;
         }
 
-        var defaultStyleFont = StyleResolutionService
-            .GetDefaultParagraphStyle(doc)?
+        var defaultStyleFont = StyleResolver
+            .GetDefaultParagraphStyle(document)?
             .StyleRunProperties?
             .RunFonts?
             .Ascii?
@@ -33,15 +34,15 @@ public static class FormattingResolutionService
         if (!string.IsNullOrEmpty(defaultStyleFont))
             return defaultStyleFont;
 
-        return StyleResolutionService
-            .GetDocumentDefaultRunProperties(doc)?
+        return StyleResolver
+            .GetDocumentDefaultRunProperties(document)?
             .RunFonts?
             .Ascii?
             .Value;
     }
 
-    public static double? ResolveFontSizePt(
-        WordprocessingDocument doc,
+    public double? ResolveFontSizePt(
+        WordprocessingDocument document,
         Paragraph paragraph,
         Run run)
     {
@@ -49,9 +50,9 @@ public static class FormattingResolutionService
         if (runSize is not null)
             return runSize;
 
-        foreach (var style in StyleResolutionService.GetStyleChain(
-                     doc,
-                     StyleResolutionService.GetParagraphStyleId(paragraph)))
+        foreach (var style in StyleResolver.GetStyleChain(
+                     document,
+                     StyleResolver.GetParagraphStyleId(paragraph)))
         {
             var styleSize = UnitConversion.HalfPointsToPoints(style.StyleRunProperties?.FontSize?.Val?.Value);
             if (styleSize is not null)
@@ -59,23 +60,26 @@ public static class FormattingResolutionService
         }
 
         var defaultStyleSize = UnitConversion.HalfPointsToPoints(
-            StyleResolutionService.GetDefaultParagraphStyle(doc)?.StyleRunProperties?.FontSize?.Val?.Value);
+            StyleResolver.GetDefaultParagraphStyle(document)?.StyleRunProperties?.FontSize?.Val?.Value);
         if (defaultStyleSize is not null)
             return defaultStyleSize;
 
         return UnitConversion.HalfPointsToPoints(
-            StyleResolutionService.GetDocumentDefaultRunProperties(doc)?.FontSize?.Val?.Value);
+            StyleResolver.GetDocumentDefaultRunProperties(document)?.FontSize?.Val?.Value);
     }
 
-    public static bool IsRunBold(WordprocessingDocument doc, Paragraph paragraph, Run run)
+    public bool IsRunBold(
+        WordprocessingDocument document,
+        Paragraph paragraph,
+        Run run)
     {
         var runBold = GetOnOffValue(run.RunProperties?.Bold);
         if (runBold is not null)
             return runBold.Value;
 
-        foreach (var style in StyleResolutionService.GetStyleChain(
-                     doc,
-                     StyleResolutionService.GetParagraphStyleId(paragraph)))
+        foreach (var style in StyleResolver.GetStyleChain(
+                     document,
+                     StyleResolver.GetParagraphStyleId(paragraph)))
         {
             var styleBold = GetOnOffValue(style.StyleRunProperties?.Bold);
             if (styleBold is not null)
@@ -83,12 +87,12 @@ public static bool IsRunBold(WordprocessingDocument doc, Paragraph paragraph, Ru
         }
 
         var defaultBold = GetOnOffValue(
-            StyleResolutionService.GetDocumentDefaultRunProperties(doc)?.Bold);
+            StyleResolver.GetDocumentDefaultRunProperties(document)?.Bold);
         return defaultBold ?? false;
     }
 
-    public static JustificationValues ResolveJustification(
-        WordprocessingDocument doc,
+    public JustificationValues ResolveJustification(
+        WordprocessingDocument document,
         Paragraph paragraph,
         bool includeDefaultStyle = true)
     {
@@ -96,9 +100,9 @@ public static JustificationValues ResolveJustification(
         if (paragraphJustification.HasValue)
             return paragraphJustification.Value;
 
-        foreach (var style in StyleResolutionService.GetStyleChain(
-                     doc,
-                     StyleResolutionService.GetParagraphStyleId(paragraph)))
+        foreach (var style in StyleResolver.GetStyleChain(
+                     document,
+                     StyleResolver.GetParagraphStyleId(paragraph)))
         {
             var styleJustification = style.StyleParagraphProperties?.Justification?.Val?.Value;
             if (styleJustification.HasValue)
@@ -107,8 +111,8 @@ public static JustificationValues ResolveJustification(
 
         if (includeDefaultStyle)
         {
-            var defaultJustification = StyleResolutionService
-                .GetDefaultParagraphStyle(doc)?
+            var defaultJustification = StyleResolver
+                .GetDefaultParagraphStyle(document)?
                 .StyleParagraphProperties?
                 .Justification?
                 .Val?
@@ -116,8 +120,8 @@ public static JustificationValues ResolveJustification(
             if (defaultJustification.HasValue)
                 return defaultJustification.Value;
 
-            var documentDefaultJustification = StyleResolutionService
-                .GetDocumentDefaultParagraphProperties(doc)?
+            var documentDefaultJustification = StyleResolver
+                .GetDocumentDefaultParagraphProperties(document)?
                 .Justification?
                 .Val?
                 .Value;
@@ -128,16 +132,18 @@ public static JustificationValues ResolveJustification(
         return JustificationValues.Left;
     }
 
-    public static int ResolveSpacingAfter(WordprocessingDocument doc, Paragraph paragraph)
+    public int ResolveSpacingAfter(
+        WordprocessingDocument document,
+        Paragraph paragraph)
     {
         var directAfter = UnitConversion.ParseOptionalTwips(
             paragraph.ParagraphProperties?.SpacingBetweenLines?.After?.Value);
         if (directAfter.HasValue)
             return directAfter.Value;
 
-        foreach (var style in StyleResolutionService.GetStyleChain(
-                     doc,
-                     StyleResolutionService.GetParagraphStyleId(paragraph)))
+        foreach (var style in StyleResolver.GetStyleChain(
+                     document,
+                     StyleResolver.GetParagraphStyleId(paragraph)))
         {
             var styleAfter = UnitConversion.ParseOptionalTwips(
                 style.StyleParagraphProperties?.SpacingBetweenLines?.After?.Value);
@@ -146,8 +152,8 @@ public static int ResolveSpacingAfter(WordprocessingDocument doc, Paragraph para
         }
 
         var defaultAfter = UnitConversion.ParseOptionalTwips(
-            StyleResolutionService
-                .GetDefaultParagraphStyle(doc)?
+            StyleResolver
+                .GetDefaultParagraphStyle(document)?
                 .StyleParagraphProperties?
                 .SpacingBetweenLines?
                 .After?
@@ -156,24 +162,24 @@ public static int ResolveSpacingAfter(WordprocessingDocument doc, Paragraph para
             return defaultAfter.Value;
 
         return UnitConversion.ParseOptionalTwips(
-            StyleResolutionService
-                .GetDocumentDefaultParagraphProperties(doc)?
+            StyleResolver
+                .GetDocumentDefaultParagraphProperties(document)?
                 .SpacingBetweenLines?
                 .After?
                 .Value) ?? 0;
     }
 
-    public static (int? LineSpacing, LineSpacingRuleValues? LineRule) ResolveLineSpacing(
-        WordprocessingDocument doc,
+    public (int? LineSpacing, LineSpacingRuleValues? LineRule) ResolveLineSpacing(
+        WordprocessingDocument document,
         Paragraph paragraph)
     {
         var direct = ParseLineSpacing(paragraph.ParagraphProperties?.SpacingBetweenLines);
         if (direct.LineSpacing.HasValue)
             return direct;
 
-        foreach (var style in StyleResolutionService.GetStyleChain(
-                     doc,
-                     StyleResolutionService.GetParagraphStyleId(paragraph)))
+        foreach (var style in StyleResolver.GetStyleChain(
+                     document,
+                     StyleResolver.GetParagraphStyleId(paragraph)))
         {
             var styleSpacing = ParseLineSpacing(style.StyleParagraphProperties?.SpacingBetweenLines);
             if (styleSpacing.LineSpacing.HasValue)
@@ -181,81 +187,47 @@ public static (int? LineSpacing, LineSpacingRuleValues? LineRule) ResolveLineSpa
         }
 
         var defaultSpacing = ParseLineSpacing(
-            StyleResolutionService.GetDefaultParagraphStyle(doc)?
+            StyleResolver.GetDefaultParagraphStyle(document)?
                 .StyleParagraphProperties?
                 .SpacingBetweenLines);
         if (defaultSpacing.LineSpacing.HasValue)
             return defaultSpacing;
 
         return ParseLineSpacing(
-            StyleResolutionService.GetDocumentDefaultParagraphProperties(doc)?
+            StyleResolver.GetDocumentDefaultParagraphProperties(document)?
                 .SpacingBetweenLines);
     }
 
-    public static (int Before, int After) ResolveParagraphSpacing(
-        WordprocessingDocument doc,
+    public int ResolveFirstLineIndent(
+        WordprocessingDocument document,
         Paragraph paragraph)
-    {
-        var paragraphSpacing = paragraph.ParagraphProperties?.SpacingBetweenLines;
-        int? before = UnitConversion.ParseOptionalTwips(paragraphSpacing?.Before?.Value);
-        int? after = UnitConversion.ParseOptionalTwips(paragraphSpacing?.After?.Value);
-
-        foreach (var style in StyleResolutionService.GetStyleChain(
-                     doc,
-                     StyleResolutionService.GetParagraphStyleId(paragraph)))
-        {
-            var styleSpacing = style.StyleParagraphProperties?.SpacingBetweenLines;
-            before ??= UnitConversion.ParseOptionalTwips(styleSpacing?.Before?.Value);
-            after ??= UnitConversion.ParseOptionalTwips(styleSpacing?.After?.Value);
-
-            if (before.HasValue && after.HasValue)
-                break;
-        }
-
-        var defaultSpacing = StyleResolutionService
-            .GetDefaultParagraphStyle(doc)?
-            .StyleParagraphProperties?
-            .SpacingBetweenLines;
-        before ??= UnitConversion.ParseOptionalTwips(defaultSpacing?.Before?.Value);
-        after ??= UnitConversion.ParseOptionalTwips(defaultSpacing?.After?.Value);
-
-        var documentDefaultSpacing = StyleResolutionService
-            .GetDocumentDefaultParagraphProperties(doc)?
-            .SpacingBetweenLines;
-        before ??= UnitConversion.ParseOptionalTwips(documentDefaultSpacing?.Before?.Value);
-        after ??= UnitConversion.ParseOptionalTwips(documentDefaultSpacing?.After?.Value);
-
-        return (before ?? 0, after ?? 0);
-    }
-
-    public static int ResolveFirstLineIndent(WordprocessingDocument doc, Paragraph paragraph)
     {
         var paragraphIndentation = paragraph.ParagraphProperties?.Indentation;
         if (HasExplicitFirstLineIndentation(paragraphIndentation))
             return GetFirstLineIndent(paragraphIndentation);
 
-        foreach (var style in StyleResolutionService.GetStyleChain(
-                     doc,
-                     StyleResolutionService.GetParagraphStyleId(paragraph)))
+        foreach (var style in StyleResolver.GetStyleChain(
+                     document,
+                     StyleResolver.GetParagraphStyleId(paragraph)))
         {
             var styleIndentation = style.StyleParagraphProperties?.Indentation;
             if (HasExplicitFirstLineIndentation(styleIndentation))
                 return GetFirstLineIndent(styleIndentation);
         }
 
-        var defaultStyle = StyleResolutionService.GetDefaultParagraphStyle(doc);
+        var defaultStyle = StyleResolver.GetDefaultParagraphStyle(document);
         if (HasExplicitFirstLineIndentation(defaultStyle?.StyleParagraphProperties?.Indentation))
             return GetFirstLineIndent(defaultStyle?.StyleParagraphProperties?.Indentation);
 
-        foreach (var style in StyleResolutionService.GetStyleChain(doc, defaultStyle?.BasedOn?.Val?.Value))
+        foreach (var style in StyleResolver.GetStyleChain(document, defaultStyle?.BasedOn?.Val?.Value))
         {
             var styleIndentation = style.StyleParagraphProperties?.Indentation;
             if (HasExplicitFirstLineIndentation(styleIndentation))
                 return GetFirstLineIndent(styleIndentation);
         }
 
-        var documentDefaultIndentation = StyleResolutionService
-            .GetDocumentDefaultParagraphProperties(doc)?
+        var documentDefaultIndentation = StyleResolver
+            .GetDocumentDefaultParagraphProperties(document)?
             .Indentation;
         if (HasExplicitFirstLineIndentation(documentDefaultIndentation))
             return GetFirstLineIndent(documentDefaultIndentation);
@@ -263,18 +235,18 @@ public static int ResolveFirstLineIndent(WordprocessingDocument doc, Paragraph p
         return 0;
     }
 
-    public static (int Left, int FirstLine) ResolveIndentation(
-        WordprocessingDocument doc,
+    public (int Left, int FirstLine) ResolveIndentation(
+        WordprocessingDocument document,
         Paragraph paragraph,
         bool includeDefaultStyle = false)
     {
-        var directIndentation = paragraph.ParagraphProperties?.Indentation;
-        if (directIndentation is not null)
-            return ParseIndentation(directIndentation);
+        var paragraphIndentation = paragraph.ParagraphProperties?.Indentation;
+        if (paragraphIndentation is not null)
+            return ParseIndentation(paragraphIndentation);
 
-        foreach (var style in StyleResolutionService.GetStyleChain(
-                     doc,
-                     StyleResolutionService.GetParagraphStyleId(paragraph)))
+        foreach (var style in StyleResolver.GetStyleChain(
+                     document,
+                     StyleResolver.GetParagraphStyleId(paragraph)))
         {
             var styleIndentation = style.StyleParagraphProperties?.Indentation;
             if (styleIndentation is not null)
@@ -283,8 +255,8 @@ public static (int Left, int FirstLine) ResolveIndentation(
 
         if (includeDefaultStyle)
         {
-            var defaultIndentation = StyleResolutionService
-                .GetDefaultParagraphStyle(doc)?
+            var defaultIndentation = StyleResolver
+                .GetDefaultParagraphStyle(document)?
                 .StyleParagraphProperties?
                 .Indentation;
             if (defaultIndentation is not null)
@@ -294,7 +266,7 @@ public static (int Left, int FirstLine) ResolveIndentation(
         return (0, 0);
     }
 
-    public static int ResolveLeftIndent(Paragraph paragraph)
+    public int ResolveLeftIndent(Paragraph paragraph)
     {
         var indentation = paragraph.ParagraphProperties?.Indentation;
         return UnitConversion.ParseTwips(indentation?.Left?.Value ?? indentation?.Start?.Value);
diff --git a/backend/Services/Formatting/StyleResolutionService.cs b/src/backend/DocumentProcessing/Formatting/StyleResolver.cs
similarity index 64%
rename from backend/Services/Formatting/StyleResolutionService.cs
rename to src/backend/DocumentProcessing/Formatting/StyleResolver.cs
index cb1c64d..3633685 100644
--- a/backend/Services/Formatting/StyleResolutionService.cs
+++ b/src/backend/DocumentProcessing/Formatting/StyleResolver.cs
@@ -1,39 +1,39 @@
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
 
-namespace backend.Services.Formatting;
+namespace backend.DocumentProcessing.Formatting;
 
-public static class StyleResolutionService
+public static class StyleResolver
 {
     public static string? GetParagraphStyleId(Paragraph paragraph)
     {
         return paragraph.ParagraphProperties?.ParagraphStyleId?.Val?.Value;
     }
 
-    public static Style? FindStyle(WordprocessingDocument doc, string? styleId)
+    public static Style? FindStyle(WordprocessingDocument document, string? styleId)
     {
         if (string.IsNullOrEmpty(styleId))
             return null;
 
-        return doc.MainDocumentPart?.StyleDefinitionsPart?.Styles?
+        return document.MainDocumentPart?.StyleDefinitionsPart?.Styles?
             .Elements<Style>()
             .FirstOrDefault(style =>
                 string.Equals(style.StyleId?.Value, styleId, StringComparison.OrdinalIgnoreCase));
     }
 
-    public static string? GetStyleName(WordprocessingDocument doc, string? styleId)
+    public static string? GetStyleName(WordprocessingDocument document, string? styleId)
     {
-        return FindStyle(doc, styleId)?.StyleName?.Val?.Value;
+        return FindStyle(document, styleId)?.StyleName?.Val?.Value;
     }
 
-    public static IEnumerable<Style> GetStyleChain(WordprocessingDocument doc, string? styleId)
+    public static IEnumerable<Style> GetStyleChain(WordprocessingDocument document, string? styleId)
     {
         var visited = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         var currentStyleId = styleId;
 
         while (!string.IsNullOrEmpty(currentStyleId) && visited.Add(currentStyleId))
         {
-            var style = FindStyle(doc, currentStyleId);
+            var style = FindStyle(document, currentStyleId);
             if (style is null)
                 yield break;
 
@@ -42,28 +42,28 @@ public static IEnumerable<Style> GetStyleChain(WordprocessingDocument doc, strin
         }
     }
 
-    public static Style? GetDefaultParagraphStyle(WordprocessingDocument doc)
+    public static Style? GetDefaultParagraphStyle(WordprocessingDocument document)
     {
-        return doc.MainDocumentPart?.StyleDefinitionsPart?.Styles?
+        return document.MainDocumentPart?.StyleDefinitionsPart?.Styles?
             .Elements<Style>()
             .FirstOrDefault(style =>
-                style.Type?.Value == StyleValues.Paragraph &&
-                style.Default?.Value == true);
+                style.Type?.Value == StyleValues.Paragraph
+                && style.Default?.Value == true);
     }
 
     public static ParagraphPropertiesBaseStyle? GetDocumentDefaultParagraphProperties(
-        WordprocessingDocument doc)
+        WordprocessingDocument document)
     {
-        return doc.MainDocumentPart?.StyleDefinitionsPart?.Styles?
+        return document.MainDocumentPart?.StyleDefinitionsPart?.Styles?
             .DocDefaults?
             .ParagraphPropertiesDefault?
             .ParagraphPropertiesBaseStyle;
     }
 
     public static RunPropertiesBaseStyle? GetDocumentDefaultRunProperties(
-        WordprocessingDocument doc)
+        WordprocessingDocument document)
     {
-        return doc.MainDocumentPart?.StyleDefinitionsPart?.Styles?
+        return document.MainDocumentPart?.StyleDefinitionsPart?.Styles?
             .DocDefaults?
             .RunPropertiesDefault?
             .RunPropertiesBaseStyle;
diff --git a/backend/Services/Formatting/UnitConversion.cs b/src/backend/DocumentProcessing/Formatting/UnitConversion.cs
similarity index 95%
rename from backend/Services/Formatting/UnitConversion.cs
rename to src/backend/DocumentProcessing/Formatting/UnitConversion.cs
index bdf52c7..8ebfbb9 100644
--- a/backend/Services/Formatting/UnitConversion.cs
+++ b/src/backend/DocumentProcessing/Formatting/UnitConversion.cs
@@ -1,4 +1,4 @@
-namespace backend.Services.Formatting;
+namespace backend.DocumentProcessing.Formatting;
 
 public static class UnitConversion
 {
diff --git a/src/backend/DocumentProcessing/Lists/ListAnalyzer.cs b/src/backend/DocumentProcessing/Lists/ListAnalyzer.cs
new file mode 100644
index 0000000..5bdc092
--- /dev/null
+++ b/src/backend/DocumentProcessing/Lists/ListAnalyzer.cs
@@ -0,0 +1,71 @@
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Formatting;
+using ThesisValidator.Rules;
+
+namespace backend.DocumentProcessing.Lists;
+
+public sealed class ListAnalyzer
+{
+    private readonly FormattingResolver _formattingResolver;
+    private readonly ParagraphClassifier _paragraphClassifier;
+
+    public ListAnalyzer(
+        FormattingResolver? formattingResolver = null,
+        ParagraphClassifier? paragraphClassifier = null)
+    {
+        _formattingResolver = formattingResolver ?? new FormattingResolver();
+        _paragraphClassifier = paragraphClassifier ?? new ParagraphClassifier();
+    }
+
+    public IReadOnlyList<ListGroup> ExtractLists(RuleContext context)
+    {
+        var lists = new List<ListGroup>();
+        ListGroup? currentList = null;
+        int? currentNumberingId = null;
+
+        foreach (var paragraphNode in context.Content.BodyChildParagraphs)
+        {
+            var paragraph = paragraphNode.Paragraph;
+            if (paragraphNode.IsHeading
+                || _paragraphClassifier.HasExcludedStructuralStyle(
+                    context.RawDocument,
+                    paragraph,
+                    excludeListStyles: false))
+            {
+                currentList = null;
+                currentNumberingId = null;
+                continue;
+            }
+
+            var numberingProps = paragraph.ParagraphProperties?.NumberingProperties;
+            var numberingId = numberingProps?.NumberingId?.Val?.Value;
+
+            if (numberingId.HasValue)
+            {
+                if (currentList is null || currentNumberingId != numberingId)
+                {
+                    currentList = new ListGroup(numberingId.Value);
+                    lists.Add(currentList);
+                    currentNumberingId = numberingId;
+                }
+
+                var level = numberingProps?.NumberingLevelReference?.Val?.Value ?? 0;
+                var indent = _formattingResolver.ResolveLeftIndent(paragraph);
+
+                currentList.Items.Add(new ListItem(
+                    paragraph,
+                    paragraphNode.BodyIndex,
+                    level,
+                    indent,
+                    paragraphNode.Text));
+            }
+            else
+            {
+                currentList = null;
+                currentNumberingId = null;
+            }
+        }
+
+        return lists;
+    }
+}
diff --git a/src/backend/DocumentProcessing/Lists/ListGroup.cs b/src/backend/DocumentProcessing/Lists/ListGroup.cs
new file mode 100644
index 0000000..fb287d4
--- /dev/null
+++ b/src/backend/DocumentProcessing/Lists/ListGroup.cs
@@ -0,0 +1,13 @@
+namespace backend.DocumentProcessing.Lists;
+
+public sealed class ListGroup
+{
+    public ListGroup(int numberingId)
+    {
+        NumberingId = numberingId;
+    }
+
+    public int NumberingId { get; }
+
+    public List<ListItem> Items { get; } = [];
+}
diff --git a/src/backend/DocumentProcessing/Lists/ListItem.cs b/src/backend/DocumentProcessing/Lists/ListItem.cs
new file mode 100644
index 0000000..aab2d8e
--- /dev/null
+++ b/src/backend/DocumentProcessing/Lists/ListItem.cs
@@ -0,0 +1,10 @@
+using DocumentFormat.OpenXml.Wordprocessing;
+
+namespace backend.DocumentProcessing.Lists;
+
+public sealed record ListItem(
+    Paragraph Paragraph,
+    int ParagraphIndex,
+    int Level,
+    int IndentLeft,
+    string Text);
diff --git a/src/backend/DocumentProcessing/Paragraphs/ParagraphClassifier.cs b/src/backend/DocumentProcessing/Paragraphs/ParagraphClassifier.cs
new file mode 100644
index 0000000..dade50c
--- /dev/null
+++ b/src/backend/DocumentProcessing/Paragraphs/ParagraphClassifier.cs
@@ -0,0 +1,64 @@
+using backend.DocumentProcessing.Formatting;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+
+namespace backend.DocumentProcessing.Paragraphs;
+
+public sealed class ParagraphClassifier
+{
+    private static readonly string[] ExcludedStylePatterns =
+    [
+        "heading", "nagwek",
+        "title", "tytu",
+        "subtitle", "podtytu",
+        "caption", "podpis",
+        "toc", "spis",
+        "quote", "cytat",
+        "header", "footer",
+        "list", "lista",
+        "legend", "legenda",
+        "figure", "rysunek",
+        "rys",
+        "table",
+        "bibliography"
+    ];
+
+    public bool IsListItem(Paragraph paragraph)
+    {
+        return paragraph.ParagraphProperties?.NumberingProperties is not null;
+    }
+
+    public bool HasExcludedStructuralStyle(
+        WordprocessingDocument document,
+        Paragraph paragraph,
+        bool excludeListStyles = true)
+    {
+        var styleId = StyleResolver.GetParagraphStyleId(paragraph);
+        if (ContainsExcludedPattern(styleId, excludeListStyles))
+            return true;
+
+        var style = StyleResolver.FindStyle(document, styleId);
+        var styleName = style?.StyleName?.Val?.Value;
+        if (ContainsExcludedPattern(styleName, excludeListStyles))
+            return true;
+
+        var outlineLevel = style?.StyleParagraphProperties?.OutlineLevel?.Val?.Value;
+        return outlineLevel.HasValue && outlineLevel.Value <= 8;
+    }
+
+    private static bool ContainsExcludedPattern(string? value, bool excludeListStyles)
+    {
+        if (string.IsNullOrEmpty(value))
+            return false;
+
+        var valueLower = value.ToLowerInvariant();
+        return ExcludedStylePatterns.Any(pattern =>
+            (excludeListStyles || !IsListStylePattern(pattern))
+            && valueLower.Contains(pattern));
+    }
+
+    private static bool IsListStylePattern(string pattern)
+    {
+        return pattern is "list" or "lista";
+    }
+}
diff --git a/backend/Services/Skipping/TextBoxSkipRule.cs b/src/backend/DocumentProcessing/Skipping/TextBoxContentDetector.cs
similarity index 66%
rename from backend/Services/Skipping/TextBoxSkipRule.cs
rename to src/backend/DocumentProcessing/Skipping/TextBoxContentDetector.cs
index 2f59522..3d0c065 100644
--- a/backend/Services/Skipping/TextBoxSkipRule.cs
+++ b/src/backend/DocumentProcessing/Skipping/TextBoxContentDetector.cs
@@ -1,55 +1,15 @@
 using System.Globalization;
-using Backend.Models;
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Wordprocessing;
 
-namespace backend.Services.Skipping;
+namespace backend.DocumentProcessing.Skipping;
 
-public sealed class TextBoxSkipRule : ISkipRule
+public static class TextBoxContentDetector
 {
     private const string WordprocessingNamespace = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
     private const string DrawingNamespace = "http://schemas.openxmlformats.org/drawingml/2006/main";
     private const string VmlNamespace = "urn:schemas-microsoft-com:vml";
 
-    public SkipDecision ShouldSkipParagraph(
-        DocumentFormat.OpenXml.Packaging.WordprocessingDocument doc,
-        Paragraph paragraph,
-        UniversityConfig config,
-        SkipContext context)
-    {
-        return ShouldSkipParagraph(paragraph, config)
-            ? SkipDecision.Skip(SkipReason.TextBox, "Paragraph is inside or only contains text-box/drawing text.")
-            : SkipDecision.Include;
-    }
-
-    public SkipDecision ShouldSkipRun(
-        DocumentFormat.OpenXml.Packaging.WordprocessingDocument doc,
-        Paragraph paragraph,
-        Run run,
-        UniversityConfig config,
-        SkipContext context)
-    {
-        return SkipDecisionService.ShouldSkipTextBoxes(config) && IsInsideTextBoxOrDrawingText(run)
-            ? SkipDecision.Skip(SkipReason.TextBox, "Run is inside text-box/drawing text.")
-            : SkipDecision.Include;
-    }
-
-    public SkipDecision ShouldSkipElement(
-        OpenXmlElement element,
-        UniversityConfig config,
-        SkipContext context)
-    {
-        return SkipDecisionService.ShouldSkipTextBoxes(config) && ContainsTextBoxContent(element)
-            ? SkipDecision.Skip(SkipReason.TextBox, "Element contains text-box/drawing text.")
-            : SkipDecision.Include;
-    }
-
-    public static bool ShouldSkipParagraph(Paragraph paragraph, UniversityConfig config)
-    {
-        return SkipDecisionService.ShouldSkipTextBoxes(config)
-            && (IsInsideTextBoxOrDrawingText(paragraph) || IsTextBoxOnlyParagraph(paragraph));
-    }
-
     public static bool ContainsTextBoxContent(OpenXmlElement element)
     {
         return ContainsElement(element, IsTextBoxContentElement);
@@ -69,7 +29,7 @@ public static bool IsInsideTextBoxOrDrawingText(OpenXmlElement element)
         return false;
     }
 
-    private static bool IsTextBoxOnlyParagraph(Paragraph paragraph)
+    public static bool IsTextBoxOnlyParagraph(Paragraph paragraph)
     {
         return paragraph.Descendants<Text>().Any(IsInsideTextBoxOrDrawingText)
             && !HasMeaningfulContent(GetParagraphTextWithoutTextBoxes(paragraph));
diff --git a/src/backend/DocumentProcessing/TablesOfContents/TableOfContentsDetection.cs b/src/backend/DocumentProcessing/TablesOfContents/TableOfContentsDetection.cs
new file mode 100644
index 0000000..c4f424c
--- /dev/null
+++ b/src/backend/DocumentProcessing/TablesOfContents/TableOfContentsDetection.cs
@@ -0,0 +1,16 @@
+using DocumentFormat.OpenXml.Wordprocessing;
+
+namespace backend.DocumentProcessing.TablesOfContents;
+
+public enum TableOfContentsKind
+{
+    None,
+    Automatic,
+    Manual
+}
+
+public sealed record TableOfContentsDetection(
+    TableOfContentsKind Kind,
+    Paragraph? Paragraph,
+    int ParagraphIndex,
+    string? Text);
diff --git a/backend/Services/Structure/TableOfContentsDetectionService.cs b/src/backend/DocumentProcessing/TablesOfContents/TableOfContentsDetector.cs
similarity index 84%
rename from backend/Services/Structure/TableOfContentsDetectionService.cs
rename to src/backend/DocumentProcessing/TablesOfContents/TableOfContentsDetector.cs
index b52a978..53c9c3c 100644
--- a/backend/Services/Structure/TableOfContentsDetectionService.cs
+++ b/src/backend/DocumentProcessing/TablesOfContents/TableOfContentsDetector.cs
@@ -1,26 +1,13 @@
 using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
-using backend.Services.Extraction;
+using backend.DocumentProcessing.Content;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
 
-namespace backend.Services.Structure;
+namespace backend.DocumentProcessing.TablesOfContents;
 
-public enum TableOfContentsKind
-{
-    None,
-    Automatic,
-    Manual
-}
-
-public sealed record TableOfContentsDetection(
-    TableOfContentsKind Kind,
-    Paragraph? Paragraph,
-    int ParagraphIndex,
-    string? Text);
-
-public static partial class TableOfContentsDetectionService
+public static partial class TableOfContentsDetector
 {
     private static readonly IReadOnlySet<string> ManualTocNames = new HashSet<string>(
         new[]
@@ -38,9 +25,9 @@ public static partial class TableOfContentsDetectionService
     [GeneratedRegex(@"\s+", RegexOptions.Compiled)]
     private static partial Regex WhitespaceRegex();
 
-    public static TableOfContentsDetection Detect(WordprocessingDocument doc)
+    public static TableOfContentsDetection Detect(WordprocessingDocument document)
     {
-        var body = doc.MainDocumentPart?.Document.Body;
+        var body = document.MainDocumentPart?.Document.Body;
         if (body is null)
             return new TableOfContentsDetection(TableOfContentsKind.None, null, 0, null);
 
@@ -68,7 +55,7 @@ public static bool ContainsTocFieldCode(Paragraph paragraph)
 
     private static TableOfContentsDetection? FindAutomaticTableOfContents(Body body)
     {
-        int paragraphIndex = 0;
+        var paragraphIndex = 0;
         foreach (var paragraph in body.Descendants<Paragraph>())
         {
             paragraphIndex++;
@@ -78,7 +65,7 @@ public static bool ContainsTocFieldCode(Paragraph paragraph)
                     TableOfContentsKind.Automatic,
                     paragraph,
                     paragraphIndex,
-                    TextExtractionService.GetParagraphText(paragraph, skipTextBoxes: false).Trim());
+                    TextExtractor.GetParagraphText(paragraph, skipTextBoxes: false).Trim());
             }
         }
 
@@ -87,11 +74,11 @@ public static bool ContainsTocFieldCode(Paragraph paragraph)
 
     private static TableOfContentsDetection? FindManualTableOfContents(Body body)
     {
-        int paragraphIndex = 0;
+        var paragraphIndex = 0;
         foreach (var paragraph in body.Descendants<Paragraph>())
         {
             paragraphIndex++;
-            var text = TextExtractionService.GetParagraphText(paragraph, skipTextBoxes: false);
+            var text = TextExtractor.GetParagraphText(paragraph, skipTextBoxes: false);
             if (string.IsNullOrWhiteSpace(text))
                 continue;
 
diff --git a/backend/Endpoints/DocumentEndpoint.cs b/src/backend/Endpoints/Documents/DocumentEndpoint.cs
similarity index 50%
rename from backend/Endpoints/DocumentEndpoint.cs
rename to src/backend/Endpoints/Documents/DocumentEndpoint.cs
index 7ab8729..00ba95e 100644
--- a/backend/Endpoints/DocumentEndpoint.cs
+++ b/src/backend/Endpoints/Documents/DocumentEndpoint.cs
@@ -1,11 +1,9 @@
-using backend.Models;
-using Backend.Models;
+using ThesisValidationOrchestrator = backend.Application.Validation.ThesisValidator;
+using backend.DocumentProcessing.Documents;
+using backend.Endpoints.Documents.Responses;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using backend.Services.Analysis;
-using backend.Services.Exceptions;
 
-namespace backend.Endpoints;
+namespace backend.Endpoints.Documents;
 
 public static class DocumentEndpoint
 {
@@ -46,19 +44,14 @@ public static void MapDocumentEndpoint(this WebApplication app)
     private static IResult ValidateDocument(
         IFormFile? file,
         [FromForm] string? rules,
-        [FromForm] bool? skipBeforeTableOfContents,
-        [FromForm] bool? skipTextBoxes,
-        ThesisValidatorService thesisValidatorService,
-        IOptions<UniversityConfig> universityConfigOptions,
+        ThesisValidationOrchestrator validator,
         ILoggerFactory loggerFactory)
     {
         if (!DocumentUploadRequestValidator
                 .TryValidate(
-                    file, 
-                    rules, 
-                    skipBeforeTableOfContents, 
-                    skipTextBoxes, 
-                    thesisValidatorService, out var request, out var error))
+                    file,
+                    rules,
+                    validator, out var request, out var error))
         {
             return error!;
         }
@@ -66,12 +59,13 @@ private static IResult ValidateDocument(
         try
         {
             using var stream = request!.File.OpenReadStream();
-            var config = CreateRequestConfig(universityConfigOptions.Value, request);
-            var (validationResults, headings) = thesisValidatorService
-                .Validate(stream, config, request.SelectedRules);
+            var validationResults = validator.Validate(stream, request.SelectedRules);
             var results = validationResults.ToList();
 
-            var response = DocumentEndpointResults.CreateValidationResponse(request, config, results, headings);
+            var response = DocumentEndpointResults
+                .CreateValidationResponse(
+                    request, results);
+
             return Results.Ok(response);
         }
         catch (InvalidThesisDocumentException ex)
@@ -87,13 +81,10 @@ private static IResult ValidateDocument(
     private static IResult ValidateWithComments(
         IFormFile? file,
         [FromForm] string? rules,
-        [FromForm] bool? skipBeforeTableOfContents,
-        [FromForm] bool? skipTextBoxes,
-        ThesisValidatorService thesisValidatorService,
-        IOptions<UniversityConfig> universityConfigOptions,
+        ThesisValidationOrchestrator validator,
         ILoggerFactory loggerFactory)
     {
-        if (!DocumentUploadRequestValidator.TryValidate(file, rules, skipBeforeTableOfContents, skipTextBoxes, thesisValidatorService, out var request, out var error))
+        if (!DocumentUploadRequestValidator.TryValidate(file, rules, validator, out var request, out var error))
         {
             return error!;
         }
@@ -101,8 +92,7 @@ private static IResult ValidateWithComments(
         try
         {
             using var stream = request!.File.OpenReadStream();
-            var config = CreateRequestConfig(universityConfigOptions.Value, request);
-            var (_, annotatedDocument) = thesisValidatorService.ValidateWithComments(stream, config, request.SelectedRules);
+            var (_, annotatedDocument) = validator.ValidateWithComments(stream, request.SelectedRules);
 
             var outputFileName = DocumentEndpointResults.GetAnnotatedFileName(request.FileName);
 
@@ -122,21 +112,21 @@ private static IResult ValidateWithComments(
         }
     }
 
-    private static IResult GetAvailableRules(ThesisValidatorService thesisValidatorService)
+    private static IResult GetAvailableRules(
+        ThesisValidationOrchestrator validator)
     {
-        var ruleList = thesisValidatorService.GetAvailableRules()
-            .Select(rule => new
-            {
-                Name = rule.Id,
-                rule.DisplayName,
-                rule.Category,
-                rule.DefaultSeverity,
-                rule.Enabled,
-                rule.Selectable
-            })
-            .ToList();
+        var ruleList = validator.GetAvailableRules()
+                .Select(rule => new
+                {
+                    Name = rule.Id,
+                    rule.DisplayName,
+                    rule.Category,
+                    rule.DefaultSeverity,
+                })
+                .ToList();
 
         return Results.Ok(new { Rules = ruleList, Count = ruleList.Count });
+
     }
 
     private static IResult HealthCheck()
@@ -144,49 +134,4 @@ private static IResult HealthCheck()
         return Results.Ok(new { Status = "Healthy", Timestamp = DateTime.UtcNow });
     }
 
-    private static UniversityConfig CreateRequestConfig(
-        UniversityConfig baseConfig,
-        DocumentUploadRequest request)
-    {
-        return new UniversityConfig
-        {
-            Name = baseConfig.Name,
-            Language = baseConfig.Language,
-            Analysis = new AnalysisConfig
-            {
-                SkipBeforeTableOfContents = request.SkipBeforeTableOfContents,
-                SkipTextBoxes = request.SkipTextBoxes ?? baseConfig.Analysis.SkipTextBoxes,
-                SkipTableOfContentsContent = baseConfig.Analysis.SkipTableOfContentsContent
-            },
-            Rules = new RuleSettingsConfig
-            {
-                Overrides = baseConfig.Rules.Overrides.ToDictionary(
-                    pair => pair.Key,
-                    pair => new RuleOverrideConfig
-                    {
-                        Severity = pair.Value.Severity
-                    },
-                    StringComparer.OrdinalIgnoreCase)
-            },
-            Formatting = new FormattingConfig
-            {
-                CheckTableOfContents = baseConfig.Formatting.CheckTableOfContents,
-                SkipBeforeTableOfContents = request.SkipBeforeTableOfContents,
-                SkipTextBoxes = request.SkipTextBoxes ?? baseConfig.Formatting.SkipTextBoxes,
-                SkipTableOfContentsContent = baseConfig.Formatting.SkipTableOfContentsContent,
-                Font = new FontConfig
-                {
-                    FontFamily = baseConfig.Formatting.Font.FontFamily,
-                    FontSize = baseConfig.Formatting.Font.FontSize
-                },
-                Layout = new LayoutConfig
-                {
-                    MarginLeft = baseConfig.Formatting.Layout.MarginLeft,
-                    MarginRight = baseConfig.Formatting.Layout.MarginRight,
-                    RequiredIndentCm = baseConfig.Formatting.Layout.RequiredIndentCm,
-                    ParagraphSpacingRule = baseConfig.Formatting.Layout.ParagraphSpacingRule.ToList()
-                }
-            }
-        };
-    }
 }
diff --git a/backend/Endpoints/DocumentEndpointResults.cs b/src/backend/Endpoints/Documents/DocumentEndpointResults.cs
similarity index 91%
rename from backend/Endpoints/DocumentEndpointResults.cs
rename to src/backend/Endpoints/Documents/DocumentEndpointResults.cs
index fa10a71..acdb4ac 100644
--- a/backend/Endpoints/DocumentEndpointResults.cs
+++ b/src/backend/Endpoints/Documents/DocumentEndpointResults.cs
@@ -1,21 +1,19 @@
-using backend.Models;
-using Backend.Models;
+using backend.Application.Validation;
+using backend.Endpoints.Documents.Responses;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
-namespace backend.Endpoints;
+namespace backend.Endpoints.Documents;
 
 internal static class DocumentEndpointResults
 {
     public const string DocxContentType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
 
-    private const string LoggerCategory = "backend.Endpoints.DocumentEndpoint";
+    private const string LoggerCategory = "backend.Endpoints.Documents.DocumentEndpoint";
 
     public static DocumentValidationResponse CreateValidationResponse(
         DocumentUploadRequest request,
-        UniversityConfig config,
-        IReadOnlyList<ValidationResult> results,
-        List<HeadingInfo> headings)
+        IReadOnlyList<ValidationIssue> results)
     {
         return new DocumentValidationResponse
         {
@@ -25,9 +23,9 @@ public static DocumentValidationResponse CreateValidationResponse(
             IsValid = !results.Any(r => r.IsError),
             TotalErrors = results.Count(r => r.IsError),
             TotalWarnings = results.Count(r => !r.IsError),
-            Results = results.ToList(),
-            ConfigUsed = config.Name,
-            Headings = headings
+            Results = results
+                .Select(ValidationIssueResponse.From)
+                .ToList()
         };
     }
 
diff --git a/src/backend/Endpoints/Documents/Requests/DocumentUploadRequest.cs b/src/backend/Endpoints/Documents/Requests/DocumentUploadRequest.cs
new file mode 100644
index 0000000..55eab4a
--- /dev/null
+++ b/src/backend/Endpoints/Documents/Requests/DocumentUploadRequest.cs
@@ -0,0 +1,8 @@
+using Microsoft.AspNetCore.Http;
+
+namespace backend.Endpoints.Documents;
+
+internal sealed record DocumentUploadRequest(
+    IFormFile File,
+    string FileName,
+    IReadOnlyList<string> SelectedRules);
diff --git a/backend/Endpoints/DocumentUploadRequestValidator.cs b/src/backend/Endpoints/Documents/Requests/DocumentUploadRequestValidator.cs
similarity index 89%
rename from backend/Endpoints/DocumentUploadRequestValidator.cs
rename to src/backend/Endpoints/Documents/Requests/DocumentUploadRequestValidator.cs
index 56c58e5..560fae9 100644
--- a/backend/Endpoints/DocumentUploadRequestValidator.cs
+++ b/src/backend/Endpoints/Documents/Requests/DocumentUploadRequestValidator.cs
@@ -1,17 +1,15 @@
+using ThesisValidationOrchestrator = backend.Application.Validation.ThesisValidator;
 using System.Text.Json;
 using Microsoft.AspNetCore.Http;
-using backend.Services.Analysis;
 
-namespace backend.Endpoints;
+namespace backend.Endpoints.Documents;
 
 internal static class DocumentUploadRequestValidator
 {
     public static bool TryValidate(
         IFormFile? file,
         string? rules,
-        bool? skipBeforeTableOfContents,
-        bool? skipTextBoxes,
-        ThesisValidatorService thesisValidatorService,
+        ThesisValidationOrchestrator validator,
         out DocumentUploadRequest? request,
         out IResult? error)
     {
@@ -29,14 +27,14 @@ public static bool TryValidate(
             return false;
         }
 
-        var unknownRules = thesisValidatorService.GetUnknownRuleNames(selectedRules);
+        var unknownRules = validator.GetUnknownRuleNames(selectedRules);
         if (unknownRules.Count > 0)
         {
             error = DocumentEndpointResults.UnknownRules(unknownRules);
             return false;
         }
 
-        request = new DocumentUploadRequest(file!, fileName, selectedRules, skipBeforeTableOfContents == true, skipTextBoxes);
+        request = new DocumentUploadRequest(file!, fileName, selectedRules);
         return true;
     }
 
diff --git a/src/backend/Endpoints/Documents/Responses/DocumentLocationResponse.cs b/src/backend/Endpoints/Documents/Responses/DocumentLocationResponse.cs
new file mode 100644
index 0000000..b9ef84c
--- /dev/null
+++ b/src/backend/Endpoints/Documents/Responses/DocumentLocationResponse.cs
@@ -0,0 +1,31 @@
+using ThesisValidator.Rules;
+
+namespace backend.Endpoints.Documents.Responses;
+
+public sealed class DocumentLocationResponse
+{
+    public int Paragraph { get; set; }
+
+    public int Run { get; set; }
+
+    public int CharacterOffset { get; set; }
+
+    public int Length { get; set; }
+
+    public string Text { get; set; } = string.Empty;
+
+    public string Section { get; set; } = string.Empty;
+
+    public static DocumentLocationResponse From(DocumentLocation location)
+    {
+        return new DocumentLocationResponse
+        {
+            Paragraph = location.Paragraph,
+            Run = location.Run,
+            CharacterOffset = location.CharacterOffset,
+            Length = location.Length,
+            Text = location.Text,
+            Section = location.Section
+        };
+    }
+}
diff --git a/backend/Models/DocumentValidationResponse.cs b/src/backend/Endpoints/Documents/Responses/DocumentValidationResponse.cs
similarity index 63%
rename from backend/Models/DocumentValidationResponse.cs
rename to src/backend/Endpoints/Documents/Responses/DocumentValidationResponse.cs
index fba20ea..ac6d9c2 100644
--- a/backend/Models/DocumentValidationResponse.cs
+++ b/src/backend/Endpoints/Documents/Responses/DocumentValidationResponse.cs
@@ -1,14 +1,20 @@
-namespace backend.Models;
+namespace backend.Endpoints.Documents.Responses;
 
-public class DocumentValidationResponse
+public sealed class DocumentValidationResponse
 {
     public string FileName { get; set; } = string.Empty;
+
     public long FileSize { get; set; }
+
     public DateTime ValidatedAt { get; set; }
+
     public bool IsValid { get; set; }
+
     public int TotalErrors { get; set; }
+
     public int TotalWarnings { get; set; }
+
     public string ConfigUsed { get; set; } = string.Empty;
-    public List<ValidationResult> Results { get; set; } = new();
-    public List<HeadingInfo> Headings { get; set; } = new();
+
+    public List<ValidationIssueResponse> Results { get; set; } = [];
 }
diff --git a/src/backend/Endpoints/Documents/Responses/ValidationIssueResponse.cs b/src/backend/Endpoints/Documents/Responses/ValidationIssueResponse.cs
new file mode 100644
index 0000000..150e61b
--- /dev/null
+++ b/src/backend/Endpoints/Documents/Responses/ValidationIssueResponse.cs
@@ -0,0 +1,33 @@
+using System.Text.Json.Serialization;
+using backend.Application.Validation;
+using ThesisValidator.Rules;
+
+namespace backend.Endpoints.Documents.Responses;
+
+public sealed class ValidationIssueResponse
+{
+    public string RuleName { get; set; } = string.Empty;
+
+    public string Message { get; set; } = string.Empty;
+
+    public bool IsError => string.Equals(Severity, RuleSeverity.Error.ToString(), StringComparison.OrdinalIgnoreCase);
+
+    public string Severity { get; set; } = RuleSeverity.Error.ToString();
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Category { get; set; }
+
+    public DocumentLocationResponse Location { get; set; } = new();
+
+    public static ValidationIssueResponse From(ValidationIssue issue)
+    {
+        return new ValidationIssueResponse
+        {
+            RuleName = issue.RuleName,
+            Message = issue.Message,
+            Severity = issue.Severity.ToString(),
+            Category = issue.Category,
+            Location = DocumentLocationResponse.From(issue.Location)
+        };
+    }
+}
diff --git a/src/backend/Extensions/ServiceCollectionExtensions.cs b/src/backend/Extensions/ServiceCollectionExtensions.cs
new file mode 100644
index 0000000..42a7d17
--- /dev/null
+++ b/src/backend/Extensions/ServiceCollectionExtensions.cs
@@ -0,0 +1,117 @@
+using System.Reflection;
+using backend.Annotation;
+using backend.Application.Validation;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Context;
+using backend.DocumentProcessing.Documents;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Paragraphs;
+using backend.Infrastructure.LanguageTool;
+using ThesisValidator.Rules;
+using ThesisValidationOrchestrator = backend.Application.Validation.ThesisValidator;
+
+namespace backend.Extensions;
+
+internal static class ServiceCollectionExtensions
+{
+    public const string FrontendCorsPolicy = "AllowFrontend";
+
+    public static IServiceCollection AddPresentation(
+        this IServiceCollection services,
+        IConfiguration configuration,
+        IWebHostEnvironment environment)
+    {
+        services.AddEndpointsApiExplorer();
+        services.AddSwaggerGen();
+        services.AddProblemDetails();
+
+        var allowedOrigins = GetAllowedOrigins(configuration, environment);
+
+        services.AddCors(options =>
+        {
+            options.AddPolicy(FrontendCorsPolicy, policy =>
+            {
+                policy.WithOrigins(allowedOrigins)
+                    .AllowAnyHeader()
+                    .AllowAnyMethod();
+            });
+        });
+
+        return services;
+    }
+
+    private static string[] GetAllowedOrigins(
+        IConfiguration configuration,
+        IWebHostEnvironment environment)
+    {
+        var allowedOrigins = configuration
+            .GetSection("Cors:AllowedOrigins")
+            .Get<string[]>()?
+            .Where(origin => !string.IsNullOrWhiteSpace(origin))
+            .ToArray();
+
+        if (allowedOrigins is { Length: > 0 })
+        {
+            return allowedOrigins;
+        }
+
+        if (environment.IsDevelopment())
+        {
+            return ["http://localhost:4200"];
+        }
+
+        throw new InvalidOperationException(
+            "Cors:AllowedOrigins must be configured outside the Development environment.");
+    }
+
+    public static IServiceCollection AddDocumentValidation(
+        this IServiceCollection services,
+        IConfiguration configuration,
+        Assembly rulesAssembly)
+    {
+        services.AddHttpClient<LanguageToolClient>();
+
+        services.AddOptions<ValidationSkippingOptions>()
+            .Bind(configuration.GetSection(ValidationSkippingOptions.SectionName))
+            .ValidateOnStart();
+
+        services.AddSingleton<ValidationIssueComposer>();
+        services.AddSingleton<RulePolicyResolver>();
+        services.AddSingleton<RuleOptionsBinder>();
+        services.AddSingleton<DocumentSession>();
+        services.AddSingleton<DocumentSkipResolver>();
+        services.AddSingleton<DocumentContentAnalyzer>();
+        services.AddSingleton<FormattingResolver>();
+        services.AddSingleton<ParagraphClassifier>();
+        services.AddSingleton<ListAnalyzer>();
+        services.AddSingleton<FigureCaptionAnalyzer>();
+        services.AddSingleton<SectionContextResolver>();
+        services.AddSingleton<AnnotationApplicator>();
+
+        services.AddScoped<RuleRunner>();
+        services.AddScoped<ThesisValidationOrchestrator>();
+        services.AddValidationRulesFrom(rulesAssembly);
+
+        return services;
+    }
+
+    private static IServiceCollection AddValidationRulesFrom(
+        this IServiceCollection services,
+        Assembly assembly)
+    {
+        var validationRuleTypes = assembly.GetTypes()
+            .Where(type => typeof(IValidationRule).IsAssignableFrom(type)
+                && !type.IsInterface
+                && !type.IsAbstract
+                && !type.IsNested);
+
+        foreach (var ruleType in validationRuleTypes)
+        {
+            services.AddScoped(typeof(IValidationRule), ruleType);
+        }
+
+        return services;
+    }
+}
diff --git a/src/backend/Extensions/WebApplicationExtensions.cs b/src/backend/Extensions/WebApplicationExtensions.cs
new file mode 100644
index 0000000..3b910f5
--- /dev/null
+++ b/src/backend/Extensions/WebApplicationExtensions.cs
@@ -0,0 +1,26 @@
+using backend.Endpoints.Documents;
+
+namespace backend.Extensions;
+
+internal static class WebApplicationExtensions
+{
+    public static WebApplication UsePresentation(this WebApplication app)
+    {
+        if (app.Environment.IsDevelopment())
+        {
+            app.UseSwagger();
+            app.UseSwaggerUI();
+        }
+        else
+        {
+            app.UseExceptionHandler();
+        }
+
+        app.UseHttpsRedirection();
+        app.UseCors(ServiceCollectionExtensions.FrontendCorsPolicy);
+
+        app.MapDocumentEndpoint();
+
+        return app;
+    }
+}
diff --git a/src/backend/Infrastructure/LanguageTool/LanguageToolClient.cs b/src/backend/Infrastructure/LanguageTool/LanguageToolClient.cs
new file mode 100644
index 0000000..fa2c512
--- /dev/null
+++ b/src/backend/Infrastructure/LanguageTool/LanguageToolClient.cs
@@ -0,0 +1,56 @@
+using System.Net.Http.Json;
+
+namespace backend.Infrastructure.LanguageTool;
+
+/// <summary>
+/// Service for communicating with the LanguageTool API for grammar and spell checking.
+/// </summary>
+public class LanguageToolClient
+{
+    private readonly HttpClient _httpClient;
+    private readonly string _baseUrl;
+
+    public LanguageToolClient(HttpClient httpClient, IConfiguration configuration)
+    {
+        _httpClient = httpClient;
+        _baseUrl = configuration.GetValue<string>("LanguageTool:BaseUrl") ?? "http://localhost:8010";
+    }
+
+    /// <summary>
+    /// Check text for grammar and spelling errors.
+    /// </summary>
+    /// <param name="text">The text to check.</param>
+    /// <param name="language">Language code (e.g., "en-US", "pl-PL").</param>
+    /// <returns>List of grammar/spelling matches found.</returns>
+    public async Task<LanguageToolResponse> CheckTextAsync(string text, string language = "pl-PL")
+    {
+        var content = new FormUrlEncodedContent(new Dictionary<string, string>
+        {
+            ["text"] = text,
+            ["language"] = language,
+            ["enabledOnly"] = "false"
+        });
+
+        var response = await _httpClient.PostAsync($"{_baseUrl}/v2/check", content);
+        response.EnsureSuccessStatusCode();
+
+        var result = await response.Content.ReadFromJsonAsync<LanguageToolResponse>();
+        return result ?? new LanguageToolResponse();
+    }
+
+    /// <summary>
+    /// Check if the LanguageTool service is available.
+    /// </summary>
+    public async Task<bool> IsAvailableAsync()
+    {
+        try
+        {
+            var response = await _httpClient.GetAsync($"{_baseUrl}/v2/languages");
+            return response.IsSuccessStatusCode;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+}
diff --git a/backend/Services/Language/LanguageToolService.cs b/src/backend/Infrastructure/LanguageTool/LanguageToolResponse.cs
similarity index 61%
rename from backend/Services/Language/LanguageToolService.cs
rename to src/backend/Infrastructure/LanguageTool/LanguageToolResponse.cs
index a0e85d5..4101330 100644
--- a/backend/Services/Language/LanguageToolService.cs
+++ b/src/backend/Infrastructure/LanguageTool/LanguageToolResponse.cs
@@ -1,62 +1,6 @@
-using System.Net.Http.Json;
 using System.Text.Json.Serialization;
 
-namespace backend.Services.Language;
-
-/// <summary>
-/// Service for communicating with the LanguageTool API for grammar and spell checking.
-/// </summary>
-public class LanguageToolService
-{
-    private readonly HttpClient _httpClient;
-    private readonly string _baseUrl;
-
-    public LanguageToolService(HttpClient httpClient, IConfiguration configuration)
-    {
-        _httpClient = httpClient;
-        _baseUrl = configuration.GetValue<string>("LanguageTool:BaseUrl") ?? "http://localhost:8010";
-    }
-
-    /// <summary>
-    /// Check text for grammar and spelling errors.
-    /// </summary>
-    /// <param name="text">The text to check.</param>
-    /// <param name="language">Language code (e.g., "en-US", "pl-PL").</param>
-    /// <returns>List of grammar/spelling matches found.</returns>
-    public async Task<LanguageToolResponse> CheckTextAsync(string text, string language = "pl-PL")
-    {
-        var content = new FormUrlEncodedContent(new Dictionary<string, string>
-        {
-            ["text"] = text,
-            ["language"] = language,
-            ["enabledOnly"] = "false"
-        });
-
-        var response = await _httpClient.PostAsync($"{_baseUrl}/v2/check", content);
-        response.EnsureSuccessStatusCode();
-
-        var result = await response.Content.ReadFromJsonAsync<LanguageToolResponse>();
-        return result ?? new LanguageToolResponse();
-    }
-
-    /// <summary>
-    /// Check if the LanguageTool service is available.
-    /// </summary>
-    public async Task<bool> IsAvailableAsync()
-    {
-        try
-        {
-            var response = await _httpClient.GetAsync($"{_baseUrl}/v2/languages");
-            return response.IsSuccessStatusCode;
-        }
-        catch
-        {
-            return false;
-        }
-    }
-}
-
-#region LanguageTool API Response Models
+namespace backend.Infrastructure.LanguageTool;
 
 public class LanguageToolResponse
 {
@@ -171,5 +115,3 @@ public class LanguageToolCategory
     [JsonPropertyName("name")]
     public string Name { get; set; } = string.Empty;
 }
-
-#endregion
diff --git a/src/backend/Models/.gitkeep b/src/backend/Models/.gitkeep
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/backend/Models/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/src/backend/Program.cs b/src/backend/Program.cs
new file mode 100644
index 0000000..b261604
--- /dev/null
+++ b/src/backend/Program.cs
@@ -0,0 +1,12 @@
+using backend.Extensions;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services
+    .AddPresentation(builder.Configuration, builder.Environment)
+    .AddDocumentValidation(builder.Configuration, typeof(Program).Assembly);
+
+var app = builder.Build();
+
+app.UsePresentation();
+app.Run();
diff --git a/backend/Properties/launchSettings.json b/src/backend/Properties/launchSettings.json
similarity index 100%
rename from backend/Properties/launchSettings.json
rename to src/backend/Properties/launchSettings.json
diff --git a/src/backend/Rules/Formatting/FontFamilyRule/FontFamilyRule.cs b/src/backend/Rules/Formatting/FontFamilyRule/FontFamilyRule.cs
new file mode 100644
index 0000000..f054b81
--- /dev/null
+++ b/src/backend/Rules/Formatting/FontFamilyRule/FontFamilyRule.cs
@@ -0,0 +1,81 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Content;
+using DocumentFormat.OpenXml.Wordprocessing;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class FontFamilyRule : ValidationRule<FontFamilyRuleOptions>
+{
+    public const string RuleId = "FontFamilyRule";
+
+    private const string DefaultRequiredFontFamily = "Times New Roman";
+    private readonly FormattingResolver _formattingResolver = new();
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Font Family",
+        Description: "Finds text runs using a font family different from the required thesis font.",
+        Category: RuleCategories.Formatting,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        FontFamilyRuleOptions options)
+    {
+        var expectedFont = string.IsNullOrWhiteSpace(options.RequiredFontFamily)
+            ? DefaultRequiredFontFamily
+            : options.RequiredFontFamily.Trim();
+
+        foreach (var paragraphNode in context.Content.BodyChildParagraphs)
+        {
+            var runIndex = 0;
+            var characterOffset = 0;
+
+            foreach (var run in paragraphNode.Paragraph.Elements<Run>())
+            {
+                runIndex++;
+
+                var text = TextExtractor.GetRunText(run);
+                if (string.IsNullOrWhiteSpace(text))
+                {
+                    characterOffset += text.Length;
+                    continue;
+                }
+
+                var actualFont = _formattingResolver.ResolveFontFamily(
+                    context.RawDocument,
+                    paragraphNode.Paragraph,
+                    run);
+
+                if (string.Equals(actualFont, expectedFont, StringComparison.OrdinalIgnoreCase))
+                {
+                    characterOffset += text.Length;
+                    continue;
+                }
+
+                var message = $"Invalid font '{actualFont ?? "unknown"}' found, expected '{expectedFont}'";
+
+                yield return new RuleProblem(
+                    message,
+                    new DocumentLocation
+                    {
+                        Paragraph = paragraphNode.BodyIndex,
+                        Run = runIndex,
+                        CharacterOffset = characterOffset,
+                        Length = text.Length,
+                        Text = TextExtractor.Truncate(text, 50)
+                    },
+                    ParagraphIndexKind.BodyElement,
+                    new RunAnnotationTarget(run));
+
+                characterOffset += text.Length;
+            }
+        }
+    }
+}
diff --git a/src/backend/Rules/Formatting/FontFamilyRule/FontFamilyRuleOptions.cs b/src/backend/Rules/Formatting/FontFamilyRule/FontFamilyRuleOptions.cs
new file mode 100644
index 0000000..a5fb470
--- /dev/null
+++ b/src/backend/Rules/Formatting/FontFamilyRule/FontFamilyRuleOptions.cs
@@ -0,0 +1,8 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class FontFamilyRuleOptions : RuleOptionsBase
+{
+    public string? RequiredFontFamily { get; set; }
+}
diff --git a/src/backend/Rules/Formatting/NoDotsInTitlesRule/NoDotsInTitlesRule.cs b/src/backend/Rules/Formatting/NoDotsInTitlesRule/NoDotsInTitlesRule.cs
new file mode 100644
index 0000000..363bcfe
--- /dev/null
+++ b/src/backend/Rules/Formatting/NoDotsInTitlesRule/NoDotsInTitlesRule.cs
@@ -0,0 +1,79 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Formatting;
+using DocumentFormat.OpenXml.Wordprocessing;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// Titles, headings, and captions must not end with a period.
+/// </summary>
+public sealed class NoDotsInTitlesRule : ValidationRule<NoDotsInTitlesRuleOptions>
+{
+    public const string RuleId = nameof(NoDotsInTitlesRule);
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Title Punctuation",
+        Description: "Finds titles, headings, and captions that end with a single period.",
+        Category: RuleCategories.Formatting,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        NoDotsInTitlesRuleOptions options)
+    {
+        foreach (var paragraph in context.Content.BodyChildParagraphs)
+        {
+            if (!HasTargetStyle(paragraph.Paragraph, options))
+                continue;
+
+            if (string.IsNullOrWhiteSpace(paragraph.Text))
+                continue;
+
+            var trimmedText = paragraph.Text.TrimEnd();
+            if (!EndsWithSinglePeriod(trimmedText))
+                continue;
+
+            var styleId = StyleResolver.GetParagraphStyleId(paragraph.Paragraph) ?? "Unknown";
+            var preview = TextExtractor.Truncate(trimmedText, 60);
+            var message =
+                $"Title/Heading should not end with a period. Style: {styleId}. Text: \"{preview}\"";
+
+            yield return new RuleProblem(
+                message,
+                new DocumentLocation
+                {
+                    Paragraph = paragraph.BodyIndex,
+                    Text = preview
+                },
+                ParagraphIndexKind.BodyElement,
+                new ParagraphAnnotationTarget(paragraph.Paragraph));
+        }
+    }
+
+    private static bool HasTargetStyle(Paragraph paragraph, NoDotsInTitlesRuleOptions options)
+    {
+        var styleId = StyleResolver.GetParagraphStyleId(paragraph);
+        if (string.IsNullOrEmpty(styleId))
+            return false;
+
+        var styleLower = styleId.ToLowerInvariant();
+        return (options.TargetStylePatterns ?? [])
+            .Any(pattern => !string.IsNullOrWhiteSpace(pattern)
+                && styleLower.Contains(pattern.Trim().ToLowerInvariant()));
+    }
+
+    private static bool EndsWithSinglePeriod(string text)
+    {
+        if (string.IsNullOrEmpty(text))
+            return false;
+
+        return text.EndsWith('.') && (text.Length < 2 || text[^2] != '.');
+    }
+}
diff --git a/src/backend/Rules/Formatting/NoDotsInTitlesRule/NoDotsInTitlesRuleOptions.cs b/src/backend/Rules/Formatting/NoDotsInTitlesRule/NoDotsInTitlesRuleOptions.cs
new file mode 100644
index 0000000..093a7f0
--- /dev/null
+++ b/src/backend/Rules/Formatting/NoDotsInTitlesRule/NoDotsInTitlesRuleOptions.cs
@@ -0,0 +1,18 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class NoDotsInTitlesRuleOptions : RuleOptionsBase
+{
+    public string[] TargetStylePatterns { get; set; } =
+    [
+        "heading",
+        "nagwek",
+        "title",
+        "tytu",
+        "subtitle",
+        "podtytu",
+        "caption",
+        "podpis"
+    ];
+}
diff --git a/src/backend/Rules/Formatting/SingleSpaceRule/SingleSpaceRule.cs b/src/backend/Rules/Formatting/SingleSpaceRule/SingleSpaceRule.cs
new file mode 100644
index 0000000..8e6a464
--- /dev/null
+++ b/src/backend/Rules/Formatting/SingleSpaceRule/SingleSpaceRule.cs
@@ -0,0 +1,78 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Figures;
+using System.Text.RegularExpressions;
+using backend.DocumentProcessing.Content;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// Rule #13: Only single spaces allowed between words.
+/// </summary>
+public sealed partial class SingleSpaceRule : ValidationRule<SingleSpaceRuleOptions>
+{
+    public const string RuleId = nameof(SingleSpaceRule);
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Single Space",
+        Description: "Finds places where words are separated by multiple spaces.",
+        Category: RuleCategories.Formatting,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    [GeneratedRegex(@"  +", RegexOptions.Compiled)]
+    private static partial Regex MultipleSpacesRegex();
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        SingleSpaceRuleOptions options)
+    {
+        foreach (var paragraph in context.Content.BodyChildParagraphs)
+        {
+            if (string.IsNullOrWhiteSpace(paragraph.Text))
+                continue;
+
+            foreach (Match match in MultipleSpacesRegex().Matches(paragraph.Text))
+            {
+                var snippet = GetContextSnippet(paragraph.Text, match.Index, match.Length);
+                var spaceCount = match.Length;
+                var message =
+                    $"Multiple spaces found ({spaceCount} spaces). Only single spaces allowed between words. Context: \"{snippet}\"";
+
+                yield return new RuleProblem(
+                    message,
+                    new DocumentLocation
+                    {
+                        Paragraph = paragraph.BodyIndex,
+                        CharacterOffset = match.Index,
+                        Length = match.Length,
+                        Text = snippet
+                    },
+                    ParagraphIndexKind.BodyElement,
+                    new ParagraphAnnotationTarget(paragraph.Paragraph));
+            }
+        }
+    }
+
+    private static string GetContextSnippet(
+        string text,
+        int matchIndex,
+        int matchLength,
+        int contextChars = 15)
+    {
+        var start = Math.Max(0, matchIndex - contextChars);
+        var end = Math.Min(text.Length, matchIndex + matchLength + contextChars);
+
+        var snippet = text[start..end];
+        var prefix = start > 0 ? "..." : string.Empty;
+        var suffix = end < text.Length ? "..." : string.Empty;
+        var beforeMatch = snippet[..(matchIndex - start)];
+        var afterMatch = snippet[(matchIndex - start + matchLength)..];
+
+        return $"{prefix}{beforeMatch}[{matchLength} spaces]{afterMatch}{suffix}";
+    }
+}
diff --git a/src/backend/Rules/Formatting/SingleSpaceRule/SingleSpaceRuleOptions.cs b/src/backend/Rules/Formatting/SingleSpaceRule/SingleSpaceRuleOptions.cs
new file mode 100644
index 0000000..63485e5
--- /dev/null
+++ b/src/backend/Rules/Formatting/SingleSpaceRule/SingleSpaceRuleOptions.cs
@@ -0,0 +1,5 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class SingleSpaceRuleOptions : RuleOptionsBase;
diff --git a/src/backend/Rules/Formatting/TextJustificationRule/TextJustificationRule.cs b/src/backend/Rules/Formatting/TextJustificationRule/TextJustificationRule.cs
new file mode 100644
index 0000000..fe8610c
--- /dev/null
+++ b/src/backend/Rules/Formatting/TextJustificationRule/TextJustificationRule.cs
@@ -0,0 +1,91 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Content;
+using DocumentFormat.OpenXml.Wordprocessing;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// Rule #15: Standard text must use full justification.
+/// </summary>
+public sealed class TextJustificationRule : ValidationRule<TextJustificationRuleOptions>
+{
+    public const string RuleId = nameof(TextJustificationRule);
+
+    private readonly FormattingResolver _formattingResolver;
+    private readonly ParagraphClassifier _paragraphClassifier;
+
+    public TextJustificationRule(
+        FormattingResolver? formattingResolver = null,
+        ParagraphClassifier? paragraphClassifier = null)
+    {
+        _formattingResolver = formattingResolver ?? new FormattingResolver();
+        _paragraphClassifier = paragraphClassifier ?? new ParagraphClassifier();
+    }
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Text Justification",
+        Description: "Finds standard body paragraphs that are not fully justified.",
+        Category: RuleCategories.Formatting,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        TextJustificationRuleOptions options)
+    {
+        foreach (var paragraph in context.Content.BodyChildParagraphs)
+        {
+            if (!TextExtractor.HasMeaningfulContent(paragraph.Text))
+                continue;
+
+            if (_paragraphClassifier.IsListItem(paragraph.Paragraph))
+                continue;
+
+            if (_paragraphClassifier.HasExcludedStructuralStyle(context.RawDocument, paragraph.Paragraph))
+                continue;
+
+            var justification = _formattingResolver.ResolveJustification(
+                context.RawDocument,
+                paragraph.Paragraph);
+
+            if (justification == JustificationValues.Both)
+                continue;
+
+            var alignmentName = GetAlignmentName(justification);
+            var preview = TextExtractor.Truncate(paragraph.Text, 50);
+            var message =
+                $"Paragraph is {alignmentName} aligned. Standard text must use full justification (both margins).";
+
+            yield return new RuleProblem(
+                message,
+                new DocumentLocation
+                {
+                    Paragraph = paragraph.BodyIndex,
+                    Text = preview
+                },
+                ParagraphIndexKind.BodyElement,
+                new ParagraphAnnotationTarget(paragraph.Paragraph));
+        }
+    }
+
+    private static string GetAlignmentName(JustificationValues justification)
+    {
+        if (justification == JustificationValues.Left)
+            return "left";
+        if (justification == JustificationValues.Right)
+            return "right";
+        if (justification == JustificationValues.Center)
+            return "center";
+        if (justification == JustificationValues.Both)
+            return "fully justified";
+        if (justification == JustificationValues.Distribute)
+            return "distributed";
+        return "left";
+    }
+}
diff --git a/src/backend/Rules/Formatting/TextJustificationRule/TextJustificationRuleOptions.cs b/src/backend/Rules/Formatting/TextJustificationRule/TextJustificationRuleOptions.cs
new file mode 100644
index 0000000..6da4f6f
--- /dev/null
+++ b/src/backend/Rules/Formatting/TextJustificationRule/TextJustificationRuleOptions.cs
@@ -0,0 +1,5 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class TextJustificationRuleOptions : RuleOptionsBase;
diff --git a/src/backend/Rules/Framework/AnnotationTarget.cs b/src/backend/Rules/Framework/AnnotationTarget.cs
new file mode 100644
index 0000000..05d2189
--- /dev/null
+++ b/src/backend/Rules/Framework/AnnotationTarget.cs
@@ -0,0 +1,9 @@
+using DocumentFormat.OpenXml.Wordprocessing;
+
+namespace ThesisValidator.Rules;
+
+public abstract record AnnotationTarget;
+
+public sealed record ParagraphAnnotationTarget(Paragraph Paragraph) : AnnotationTarget;
+
+public sealed record RunAnnotationTarget(Run Run) : AnnotationTarget;
diff --git a/src/backend/Rules/Framework/DocumentContent.cs b/src/backend/Rules/Framework/DocumentContent.cs
new file mode 100644
index 0000000..977fb60
--- /dev/null
+++ b/src/backend/Rules/Framework/DocumentContent.cs
@@ -0,0 +1,36 @@
+using DocumentFormat.OpenXml.Wordprocessing;
+
+namespace ThesisValidator.Rules;
+
+public sealed class DocumentContent
+{
+    public IReadOnlyList<ParagraphNode> BodyChildParagraphs { get; init; } = [];
+
+    public IReadOnlyList<SectionNode> Sections { get; init; } = [];
+}
+
+public sealed class ParagraphNode
+{
+    public required Paragraph Paragraph { get; init; }
+
+    public required int BodyIndex { get; init; }
+
+    public required string Text { get; init; }
+
+    public int? HeadingLevel { get; init; }
+
+    public bool IsHeading => HeadingLevel is not null;
+}
+
+public sealed class SectionNode
+{
+    public required ParagraphNode Heading { get; init; }
+
+    public bool HasIntroductoryContent { get; set; }
+
+    public List<SectionNode> Children { get; } = [];
+
+    public int Level => Heading.HeadingLevel ?? 0;
+
+    public string Title => Heading.Text;
+}
diff --git a/src/backend/Rules/Framework/DocumentLocation.cs b/src/backend/Rules/Framework/DocumentLocation.cs
new file mode 100644
index 0000000..a55df78
--- /dev/null
+++ b/src/backend/Rules/Framework/DocumentLocation.cs
@@ -0,0 +1,37 @@
+namespace ThesisValidator.Rules;
+
+/// <summary>
+/// Represents the exact location of a validation issue within a document.
+/// </summary>
+public class DocumentLocation
+{
+    /// <summary>
+    /// 1-based paragraph index in the document body.
+    /// </summary>
+    public int Paragraph { get; set; }
+
+    /// <summary>
+    /// 1-based run index within the paragraph.
+    /// </summary>
+    public int Run { get; set; }
+
+    /// <summary>
+    /// Character offset from the start of the paragraph.
+    /// </summary>
+    public int CharacterOffset { get; set; }
+
+    /// <summary>
+    /// Length of the affected text.
+    /// </summary>
+    public int Length { get; set; }
+
+    /// <summary>
+    /// The text content at this location, usually truncated.
+    /// </summary>
+    public string Text { get; set; } = string.Empty;
+
+    /// <summary>
+    /// The nearest heading/section this issue falls under.
+    /// </summary>
+    public string Section { get; set; } = string.Empty;
+}
diff --git a/src/backend/Rules/Framework/IValidationRule.cs b/src/backend/Rules/Framework/IValidationRule.cs
new file mode 100644
index 0000000..96cd841
--- /dev/null
+++ b/src/backend/Rules/Framework/IValidationRule.cs
@@ -0,0 +1,12 @@
+namespace ThesisValidator.Rules;
+
+public interface IValidationRule
+{
+    RuleDescriptor Descriptor { get; }
+
+    Type OptionsType { get; }
+
+    IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        object options);
+}
diff --git a/src/backend/Rules/Framework/ParagraphIndexKind.cs b/src/backend/Rules/Framework/ParagraphIndexKind.cs
new file mode 100644
index 0000000..1784efb
--- /dev/null
+++ b/src/backend/Rules/Framework/ParagraphIndexKind.cs
@@ -0,0 +1,7 @@
+namespace ThesisValidator.Rules;
+
+public enum ParagraphIndexKind
+{
+    Descendant,
+    BodyElement
+}
diff --git a/src/backend/Rules/Framework/RuleAvailability.cs b/src/backend/Rules/Framework/RuleAvailability.cs
new file mode 100644
index 0000000..52d3006
--- /dev/null
+++ b/src/backend/Rules/Framework/RuleAvailability.cs
@@ -0,0 +1,7 @@
+namespace ThesisValidator.Rules;
+
+public enum RuleAvailability
+{
+    Available,
+    Hidden
+}
diff --git a/src/backend/Rules/Framework/RuleCategories.cs b/src/backend/Rules/Framework/RuleCategories.cs
new file mode 100644
index 0000000..6686df3
--- /dev/null
+++ b/src/backend/Rules/Framework/RuleCategories.cs
@@ -0,0 +1,9 @@
+namespace ThesisValidator.Rules;
+
+public static class RuleCategories
+{
+    public const string Formatting = "Formatting";
+    public const string Layout = "Layout";
+    public const string Structure = "Structure";
+    public const string Language = "Language";
+}
diff --git a/src/backend/Rules/Framework/RuleContext.cs b/src/backend/Rules/Framework/RuleContext.cs
new file mode 100644
index 0000000..e0a5c32
--- /dev/null
+++ b/src/backend/Rules/Framework/RuleContext.cs
@@ -0,0 +1,9 @@
+using DocumentFormat.OpenXml.Packaging;
+
+namespace ThesisValidator.Rules;
+
+public sealed class RuleContext
+{
+    public required WordprocessingDocument RawDocument { get; init; }
+    public required DocumentContent Content { get; init; }
+}
diff --git a/src/backend/Rules/Framework/RuleDescriptor.cs b/src/backend/Rules/Framework/RuleDescriptor.cs
new file mode 100644
index 0000000..a84140b
--- /dev/null
+++ b/src/backend/Rules/Framework/RuleDescriptor.cs
@@ -0,0 +1,10 @@
+
+namespace ThesisValidator.Rules;
+
+public sealed record RuleDescriptor(
+    string Name,
+    string DisplayName,
+    string Description,
+    string Category,
+    RuleAvailability DefaultAvailability,
+    RuleSeverity DefaultSeverity);
\ No newline at end of file
diff --git a/src/backend/Rules/Framework/RuleOptionsBase.cs b/src/backend/Rules/Framework/RuleOptionsBase.cs
new file mode 100644
index 0000000..fab633c
--- /dev/null
+++ b/src/backend/Rules/Framework/RuleOptionsBase.cs
@@ -0,0 +1,8 @@
+namespace ThesisValidator.Rules;
+
+public abstract class RuleOptionsBase
+{
+    public RuleAvailability Availability { get; set; } = RuleAvailability.Available;
+
+    public RuleSeverity Severity { get; set; } = RuleSeverity.Error;
+}
diff --git a/src/backend/Rules/Framework/RuleOptionsBinder.cs b/src/backend/Rules/Framework/RuleOptionsBinder.cs
new file mode 100644
index 0000000..8352681
--- /dev/null
+++ b/src/backend/Rules/Framework/RuleOptionsBinder.cs
@@ -0,0 +1,27 @@
+using Microsoft.Extensions.Configuration;
+
+namespace ThesisValidator.Rules;
+
+public sealed class RuleOptionsBinder
+{
+    private readonly IConfiguration _configuration;
+
+    public RuleOptionsBinder(IConfiguration configuration)
+    {
+        _configuration = configuration;
+    }
+
+    public object Bind(IValidationRule rule)
+    {
+        var options = Activator.CreateInstance(rule.OptionsType)
+            ?? throw new InvalidOperationException(
+                $"Could not create options for rule '{rule.Descriptor.Name}'.");
+
+        var section = _configuration.GetSection(
+            $"Validation:Rules:{rule.Descriptor.Name}");
+
+        section.Bind(options);
+
+        return options;
+    }
+}
diff --git a/src/backend/Rules/Framework/RulePolicy.cs b/src/backend/Rules/Framework/RulePolicy.cs
new file mode 100644
index 0000000..98149c3
--- /dev/null
+++ b/src/backend/Rules/Framework/RulePolicy.cs
@@ -0,0 +1,6 @@
+
+namespace ThesisValidator.Rules;
+
+public sealed record RulePolicy(
+    RuleAvailability Availability,
+    RuleSeverity Severity);
diff --git a/src/backend/Rules/Framework/RulePolicyOptions.cs b/src/backend/Rules/Framework/RulePolicyOptions.cs
new file mode 100644
index 0000000..6cc34e7
--- /dev/null
+++ b/src/backend/Rules/Framework/RulePolicyOptions.cs
@@ -0,0 +1,9 @@
+
+namespace ThesisValidator.Rules;
+
+public sealed class RulePolicyOptions
+{
+    public RuleAvailability? Availability { get; set; }
+
+    public RuleSeverity? Severity { get; set; }
+}
diff --git a/src/backend/Rules/Framework/RulePolicyResolver.cs b/src/backend/Rules/Framework/RulePolicyResolver.cs
new file mode 100644
index 0000000..2cfa154
--- /dev/null
+++ b/src/backend/Rules/Framework/RulePolicyResolver.cs
@@ -0,0 +1,27 @@
+using Microsoft.Extensions.Configuration;
+
+namespace ThesisValidator.Rules;
+
+public sealed class RulePolicyResolver
+{
+    private readonly IConfiguration _configuration;
+
+    public RulePolicyResolver(IConfiguration configuration)
+    {
+        _configuration = configuration;
+    }
+
+    public RulePolicy Resolve(RuleDescriptor descriptor)
+    {
+        var section = _configuration.GetSection(
+            $"Validation:Rules:{descriptor.Name}");
+
+        var configuredPolicy = section.Get<RulePolicyOptions>();
+
+        return new RulePolicy(
+            Availability: configuredPolicy?.Availability
+                ?? descriptor.DefaultAvailability,
+            Severity: configuredPolicy?.Severity
+                ?? descriptor.DefaultSeverity);
+    }
+}
diff --git a/src/backend/Rules/Framework/RuleProblem.cs b/src/backend/Rules/Framework/RuleProblem.cs
new file mode 100644
index 0000000..3d9a185
--- /dev/null
+++ b/src/backend/Rules/Framework/RuleProblem.cs
@@ -0,0 +1,7 @@
+namespace ThesisValidator.Rules;
+
+public sealed record RuleProblem(
+    string Message,
+    DocumentLocation Location,
+    ParagraphIndexKind ParagraphIndexKind = ParagraphIndexKind.Descendant,
+    AnnotationTarget? AnnotationTarget = null);
diff --git a/src/backend/Rules/Framework/RuleSeverity.cs b/src/backend/Rules/Framework/RuleSeverity.cs
new file mode 100644
index 0000000..1747e00
--- /dev/null
+++ b/src/backend/Rules/Framework/RuleSeverity.cs
@@ -0,0 +1,8 @@
+namespace ThesisValidator.Rules;
+
+public enum RuleSeverity
+{
+    Info,
+    Warning,
+    Error
+}
diff --git a/src/backend/Rules/Framework/ValidationRule.cs b/src/backend/Rules/Framework/ValidationRule.cs
new file mode 100644
index 0000000..33c1981
--- /dev/null
+++ b/src/backend/Rules/Framework/ValidationRule.cs
@@ -0,0 +1,30 @@
+
+namespace ThesisValidator.Rules;
+
+public abstract class ValidationRule<TOptions> : IValidationRule
+    where TOptions : class, new()
+{
+    public abstract RuleDescriptor Descriptor { get; }
+
+    public Type OptionsType => typeof(TOptions);
+
+    public abstract IEnumerable<RuleProblem> Validate(
+            RuleContext context,
+            TOptions options);
+
+    IEnumerable<RuleProblem> IValidationRule.Validate(
+        RuleContext context,
+        object options)
+    {
+        if (options is not TOptions typedOptions)
+        {
+            throw new InvalidOperationException(
+                $"Invalid options type for rule '{Descriptor.Name}'. " +
+                $"Expected {typeof(TOptions).Name}, got {options.GetType().Name}.");
+        }
+
+        return Validate(context, typedOptions);
+    }
+
+
+}
diff --git a/src/backend/Rules/Language/GrammarRule/GrammarRule.cs b/src/backend/Rules/Language/GrammarRule/GrammarRule.cs
new file mode 100644
index 0000000..4dc1ad4
--- /dev/null
+++ b/src/backend/Rules/Language/GrammarRule/GrammarRule.cs
@@ -0,0 +1,162 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Content;
+using backend.Infrastructure.LanguageTool;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// Validates document text for grammar and spelling errors using LanguageTool.
+/// </summary>
+public sealed class GrammarRule : ValidationRule<GrammarRuleOptions>
+{
+    public const string RuleId = "Grammar";
+
+    private const string DefaultLanguage = "pl-PL";
+
+    private readonly LanguageToolClient _languageToolService;
+
+    public GrammarRule(LanguageToolClient languageToolService)
+    {
+        _languageToolService = languageToolService;
+    }
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Grammar & Spelling",
+        Description: "Finds grammar and spelling issues using LanguageTool.",
+        Category: RuleCategories.Language,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        GrammarRuleOptions options)
+    {
+        return ValidateAsync(context).GetAwaiter().GetResult();
+    }
+
+    private async Task<IReadOnlyList<RuleProblem>> ValidateAsync(RuleContext context)
+    {
+        var problems = new List<RuleProblem>();
+
+        if (!await _languageToolService.IsAvailableAsync())
+        {
+            problems.Add(new RuleProblem(
+                "Grammar check skipped: LanguageTool service is not available",
+                new DocumentLocation { Paragraph = 0 },
+                ParagraphIndexKind.BodyElement));
+            return problems;
+        }
+
+        foreach (var paragraph in context.Content.BodyChildParagraphs)
+        {
+            if (string.IsNullOrWhiteSpace(paragraph.Text))
+                continue;
+
+            problems.AddRange(await CheckParagraphGrammarAsync(paragraph));
+        }
+
+        return problems;
+    }
+
+    private async Task<IEnumerable<RuleProblem>> CheckParagraphGrammarAsync(
+        ParagraphNode paragraph)
+    {
+        var problems = new List<RuleProblem>();
+
+        try
+        {
+            var response = await _languageToolService.CheckTextAsync(paragraph.Text, DefaultLanguage);
+
+            foreach (var match in response.Matches)
+            {
+                problems.Add(CreateProblem(match, paragraph));
+            }
+        }
+        catch (Exception ex)
+        {
+            problems.Add(new RuleProblem(
+                $"Grammar check failed for paragraph {paragraph.BodyIndex}: {ex.Message}",
+                new DocumentLocation
+                {
+                    Paragraph = paragraph.BodyIndex
+                },
+                ParagraphIndexKind.BodyElement,
+                new ParagraphAnnotationTarget(paragraph.Paragraph)));
+        }
+
+        return problems;
+    }
+
+    private static RuleProblem CreateProblem(
+        LanguageToolMatch match,
+        ParagraphNode paragraph)
+    {
+        var errorText = paragraph.Text.Substring(
+            match.Offset,
+            Math.Min(match.Length, paragraph.Text.Length - match.Offset));
+
+        var suggestions = match.Replacements
+            .Take(3)
+            .Select(replacement => replacement.Value)
+            .ToList();
+
+        var suggestionText = suggestions.Count > 0
+            ? $" Suggestions: {string.Join(", ", suggestions)}"
+            : string.Empty;
+
+        var issueType = GetIssueType(match);
+        var message = $"{issueType}: {match.Message}{suggestionText}";
+
+        return new RuleProblem(
+            message,
+            new DocumentLocation
+            {
+                Paragraph = paragraph.BodyIndex,
+                Run = 1,
+                CharacterOffset = match.Offset,
+                Length = match.Length,
+                Text = TextExtractor.Truncate(errorText, 50)
+            },
+            ParagraphIndexKind.BodyElement,
+            new ParagraphAnnotationTarget(paragraph.Paragraph));
+    }
+
+    private static GrammarIssueType GetIssueType(LanguageToolMatch match)
+    {
+        var issueType = match.Rule?.IssueType?.ToLowerInvariant() ?? string.Empty;
+        var categoryId = match.Rule?.Category?.Id?.ToLowerInvariant() ?? string.Empty;
+
+        if (issueType == "misspelling" || categoryId == "typos")
+            return GrammarIssueType.Spelling;
+
+        if (categoryId.Contains("grammar") || issueType == "grammar")
+            return GrammarIssueType.Grammar;
+
+        if (categoryId.Contains("style") || issueType == "style")
+            return GrammarIssueType.Style;
+
+        if (categoryId.Contains("punctuation"))
+            return GrammarIssueType.Punctuation;
+
+        if (categoryId.Contains("typography"))
+            return GrammarIssueType.Typography;
+
+        return GrammarIssueType.Other;
+    }
+}
+
+public enum GrammarIssueType
+{
+    Spelling,
+    Grammar,
+    Punctuation,
+    Style,
+    Typography,
+    Other
+}
diff --git a/src/backend/Rules/Language/GrammarRule/GrammarRuleOptions.cs b/src/backend/Rules/Language/GrammarRule/GrammarRuleOptions.cs
new file mode 100644
index 0000000..212d20a
--- /dev/null
+++ b/src/backend/Rules/Language/GrammarRule/GrammarRuleOptions.cs
@@ -0,0 +1,5 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class GrammarRuleOptions : RuleOptionsBase;
diff --git a/src/backend/Rules/Layout/LineSpacingDependencyRule/LineSpacingDependencyRule.cs b/src/backend/Rules/Layout/LineSpacingDependencyRule/LineSpacingDependencyRule.cs
new file mode 100644
index 0000000..1614268
--- /dev/null
+++ b/src/backend/Rules/Layout/LineSpacingDependencyRule/LineSpacingDependencyRule.cs
@@ -0,0 +1,102 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Content;
+using DocumentFormat.OpenXml.Wordprocessing;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// Rule #11: Body text must use the configured line spacing.
+/// </summary>
+public sealed class LineSpacingDependencyRule : ValidationRule<LineSpacingDependencyRuleOptions>
+{
+    public const string RuleId = nameof(LineSpacingDependencyRule);
+
+    private readonly FormattingResolver _formattingResolver;
+    private readonly ParagraphClassifier _paragraphClassifier;
+
+    public LineSpacingDependencyRule(
+        FormattingResolver? formattingResolver = null,
+        ParagraphClassifier? paragraphClassifier = null)
+    {
+        _formattingResolver = formattingResolver ?? new FormattingResolver();
+        _paragraphClassifier = paragraphClassifier ?? new ParagraphClassifier();
+    }
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Line Spacing",
+        Description: "Finds body paragraphs that do not use the required line spacing.",
+        Category: RuleCategories.Layout,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        LineSpacingDependencyRuleOptions options)
+    {
+        foreach (var paragraph in context.Content.BodyChildParagraphs)
+        {
+            if (paragraph.IsHeading)
+                continue;
+
+            if (_paragraphClassifier.HasExcludedStructuralStyle(context.RawDocument, paragraph.Paragraph))
+                continue;
+
+            var (lineSpacing, lineRule) = _formattingResolver.ResolveLineSpacing(
+                context.RawDocument,
+                paragraph.Paragraph);
+            if (IsTargetLineSpacing(lineSpacing, lineRule, options.TargetLineSpacingTwips))
+                continue;
+
+            var preview = TextExtractor.Truncate(paragraph.Text, 50);
+            if (string.IsNullOrWhiteSpace(preview))
+                continue;
+
+            var message = $"Paragraph line spacing must be {FormatAutoLineSpacing(options.TargetLineSpacingTwips)}. " +
+                          $"Found: {FormatLineSpacing(lineSpacing, lineRule)}.";
+
+            yield return new RuleProblem(
+                message,
+                new DocumentLocation
+                {
+                    Paragraph = paragraph.BodyIndex,
+                    Text = preview
+                },
+                ParagraphIndexKind.BodyElement,
+                new ParagraphAnnotationTarget(paragraph.Paragraph));
+        }
+    }
+
+    private static bool IsTargetLineSpacing(
+        int? lineSpacing,
+        LineSpacingRuleValues? lineRule,
+        int targetLineSpacingTwips)
+    {
+        if (!lineSpacing.HasValue)
+            return false;
+
+        return (lineRule == null || lineRule == LineSpacingRuleValues.Auto)
+            && lineSpacing.Value == targetLineSpacingTwips;
+    }
+
+    private static string FormatLineSpacing(int? lineSpacing, LineSpacingRuleValues? lineRule)
+    {
+        if (!lineSpacing.HasValue)
+            return "not set";
+
+        if (lineRule is null || lineRule == LineSpacingRuleValues.Auto)
+            return FormatAutoLineSpacing(lineSpacing.Value);
+
+        return $"{lineSpacing.Value} with {lineRule.Value} line rule";
+    }
+
+    private static string FormatAutoLineSpacing(int lineSpacing)
+    {
+        return $"{lineSpacing / 240.0:F1}";
+    }
+}
diff --git a/src/backend/Rules/Layout/LineSpacingDependencyRule/LineSpacingDependencyRuleOptions.cs b/src/backend/Rules/Layout/LineSpacingDependencyRule/LineSpacingDependencyRuleOptions.cs
new file mode 100644
index 0000000..cd765b5
--- /dev/null
+++ b/src/backend/Rules/Layout/LineSpacingDependencyRule/LineSpacingDependencyRuleOptions.cs
@@ -0,0 +1,8 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class LineSpacingDependencyRuleOptions : RuleOptionsBase
+{
+    public int TargetLineSpacingTwips { get; set; } = 360;
+}
diff --git a/src/backend/Rules/Layout/ListIndentationConsistencyRule/ListIndentationConsistencyRule.cs b/src/backend/Rules/Layout/ListIndentationConsistencyRule/ListIndentationConsistencyRule.cs
new file mode 100644
index 0000000..f8e70d8
--- /dev/null
+++ b/src/backend/Rules/Layout/ListIndentationConsistencyRule/ListIndentationConsistencyRule.cs
@@ -0,0 +1,86 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Formatting;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// Validates that list items at the same level use identical indentation.
+/// </summary>
+public sealed class ListIndentationConsistencyRule : ValidationRule<ListIndentationConsistencyRuleOptions>
+{
+    public const string RuleId = nameof(ListIndentationConsistencyRule);
+
+    private readonly ListAnalyzer _listAnalyzer;
+
+    public ListIndentationConsistencyRule(ListAnalyzer? listAnalyzer = null)
+    {
+        _listAnalyzer = listAnalyzer ?? new ListAnalyzer();
+    }
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "List Indentation Consistency",
+        Description: "Finds list items at the same level that use different left indentation.",
+        Category: RuleCategories.Layout,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        ListIndentationConsistencyRuleOptions options)
+    {
+        foreach (var list in _listAnalyzer.ExtractLists(context))
+        {
+            foreach (var problem in ValidateIndentationConsistency(list))
+            {
+                yield return problem;
+            }
+        }
+    }
+
+    private static IEnumerable<RuleProblem> ValidateIndentationConsistency(ListGroup list)
+    {
+        var itemsByLevel = list.Items.GroupBy(item => item.Level);
+
+        foreach (var levelGroup in itemsByLevel)
+        {
+            var items = levelGroup.ToList();
+            if (items.Count < 2)
+                continue;
+
+            var indentCounts = items
+                .GroupBy(item => item.IndentLeft)
+                .OrderByDescending(group => group.Count())
+                .ToList();
+
+            if (indentCounts.Count <= 1)
+                continue;
+
+            var expectedIndent = indentCounts.First().Key;
+            foreach (var item in items.Where(item => item.IndentLeft != expectedIndent))
+            {
+                var preview = TextExtractor.Truncate(item.Text, 40);
+                var expectedCm = UnitConversion.TwipsToCentimeters(expectedIndent);
+                var actualCm = UnitConversion.TwipsToCentimeters(item.IndentLeft);
+                var message =
+                    $"List item has inconsistent indentation ({actualCm:F2} cm). " +
+                    $"Expected {expectedCm:F2} cm at level {item.Level}. Text: \"{preview}\"";
+
+                yield return new RuleProblem(
+                    message,
+                    new DocumentLocation
+                    {
+                        Paragraph = item.ParagraphIndex,
+                        Text = preview
+                    },
+                    ParagraphIndexKind.BodyElement,
+                    new ParagraphAnnotationTarget(item.Paragraph));
+            }
+        }
+    }
+}
diff --git a/src/backend/Rules/Layout/ListIndentationConsistencyRule/ListIndentationConsistencyRuleOptions.cs b/src/backend/Rules/Layout/ListIndentationConsistencyRule/ListIndentationConsistencyRuleOptions.cs
new file mode 100644
index 0000000..55bbe7a
--- /dev/null
+++ b/src/backend/Rules/Layout/ListIndentationConsistencyRule/ListIndentationConsistencyRuleOptions.cs
@@ -0,0 +1,5 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class ListIndentationConsistencyRuleOptions : RuleOptionsBase;
diff --git a/src/backend/Rules/Layout/ListPunctuationConsistencyRule/ListPunctuationConsistencyRule.cs b/src/backend/Rules/Layout/ListPunctuationConsistencyRule/ListPunctuationConsistencyRule.cs
new file mode 100644
index 0000000..c59fb9c
--- /dev/null
+++ b/src/backend/Rules/Layout/ListPunctuationConsistencyRule/ListPunctuationConsistencyRule.cs
@@ -0,0 +1,127 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Content;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// Validates list punctuation consistency.
+/// </summary>
+public sealed class ListPunctuationConsistencyRule : ValidationRule<ListPunctuationConsistencyRuleOptions>
+{
+    public const string RuleId = nameof(ListPunctuationConsistencyRule);
+
+    private readonly ListAnalyzer _listAnalyzer;
+
+    public ListPunctuationConsistencyRule(ListAnalyzer? listAnalyzer = null)
+    {
+        _listAnalyzer = listAnalyzer ?? new ListAnalyzer();
+    }
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "List Punctuation Consistency",
+        Description: "Finds list items with inconsistent trailing punctuation.",
+        Category: RuleCategories.Layout,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        ListPunctuationConsistencyRuleOptions options)
+    {
+        foreach (var list in _listAnalyzer.ExtractLists(context))
+        {
+            foreach (var problem in ValidatePunctuationConsistency(list))
+            {
+                yield return problem;
+            }
+        }
+    }
+
+    private static IEnumerable<RuleProblem> ValidatePunctuationConsistency(ListGroup list)
+    {
+        if (list.Items.Count < 2)
+            yield break;
+
+        var itemsByLevel = list.Items.GroupBy(item => item.Level);
+        foreach (var levelGroup in itemsByLevel)
+        {
+            var items = levelGroup.ToList();
+            if (items.Count < 2)
+                continue;
+
+            var firstItem = items.First();
+            var lastItem = items.Last();
+            var middleItems = items.Count > 2 ? items.Skip(1).Take(items.Count - 2).ToList() : [];
+            var expectedPunctuation = GetTrailingPunctuation(firstItem.Text);
+
+            foreach (var item in middleItems)
+            {
+                var ending = GetTrailingPunctuation(item.Text);
+                if (ending == expectedPunctuation)
+                    continue;
+
+                var expectedDesc = expectedPunctuation.HasValue
+                    ? $"'{expectedPunctuation}'"
+                    : "no punctuation";
+                var actualDesc = ending.HasValue
+                    ? $"'{ending}'"
+                    : "no punctuation";
+                var preview = GetListItemPreview(item.Text);
+                var message =
+                    $"List item ends with {actualDesc} but first item uses {expectedDesc}. Text: \"{preview}\"";
+
+                yield return CreateProblem(item, preview, message);
+            }
+
+            var lastEnding = GetTrailingPunctuation(lastItem.Text);
+            if (lastEnding == '.')
+                continue;
+
+            var lastPreview = GetListItemPreview(lastItem.Text);
+            var lastMessage = lastEnding.HasValue
+                ? $"Last list item should end with period (.), found '{lastEnding}'. Text: \"{lastPreview}\""
+                : $"Last list item should end with period (.). Text: \"{lastPreview}\"";
+
+            yield return CreateProblem(lastItem, lastPreview, lastMessage);
+        }
+    }
+
+    private static RuleProblem CreateProblem(
+        ListItem item,
+        string preview,
+        string message)
+    {
+        return new RuleProblem(
+            message,
+            new DocumentLocation
+            {
+                Paragraph = item.ParagraphIndex,
+                Text = preview
+            },
+            ParagraphIndexKind.BodyElement,
+            new ParagraphAnnotationTarget(item.Paragraph));
+    }
+
+    private static char? GetTrailingPunctuation(string text)
+    {
+        var trimmed = text.TrimEnd();
+        if (string.IsNullOrEmpty(trimmed))
+            return null;
+
+        var lastChar = trimmed[^1];
+        return char.IsPunctuation(lastChar) ? lastChar : null;
+    }
+
+    private static string GetListItemPreview(string text)
+    {
+        return string.IsNullOrWhiteSpace(text)
+            ? "[empty]"
+            : TextExtractor.Truncate(text, 40);
+    }
+}
diff --git a/src/backend/Rules/Layout/ListPunctuationConsistencyRule/ListPunctuationConsistencyRuleOptions.cs b/src/backend/Rules/Layout/ListPunctuationConsistencyRule/ListPunctuationConsistencyRuleOptions.cs
new file mode 100644
index 0000000..fefa34b
--- /dev/null
+++ b/src/backend/Rules/Layout/ListPunctuationConsistencyRule/ListPunctuationConsistencyRuleOptions.cs
@@ -0,0 +1,5 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class ListPunctuationConsistencyRuleOptions : RuleOptionsBase;
diff --git a/src/backend/Rules/Layout/ParagraphIndentRule/ParagraphIndentRule.cs b/src/backend/Rules/Layout/ParagraphIndentRule/ParagraphIndentRule.cs
new file mode 100644
index 0000000..96c3d41
--- /dev/null
+++ b/src/backend/Rules/Layout/ParagraphIndentRule/ParagraphIndentRule.cs
@@ -0,0 +1,152 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Formatting;
+using DocumentFormat.OpenXml.Wordprocessing;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class ParagraphIndentRule : ValidationRule<ParagraphIndentRuleOptions>
+{
+    public const string RuleId = "RequiredIndentCm";
+
+    private readonly FormattingResolver _formattingResolver;
+    private readonly ParagraphClassifier _paragraphClassifier;
+
+    public ParagraphIndentRule(
+        FormattingResolver? formattingResolver = null,
+        ParagraphClassifier? paragraphClassifier = null)
+    {
+        _formattingResolver = formattingResolver ?? new FormattingResolver();
+        _paragraphClassifier = paragraphClassifier ?? new ParagraphClassifier();
+    }
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Paragraph Indent",
+        Description: "Finds body paragraphs with an incorrect first-line indent.",
+        Category: RuleCategories.Layout,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        ParagraphIndentRuleOptions options)
+    {
+        var allowedIndentsTwips = options.AllowedIndentTwips ?? [];
+
+        foreach (var paragraph in context.Content.BodyChildParagraphs)
+        {
+            if (paragraph.IsHeading)
+                continue;
+
+            if (_paragraphClassifier.HasExcludedStructuralStyle(context.RawDocument, paragraph.Paragraph))
+                continue;
+
+            if (!TextExtractor.HasMeaningfulContent(paragraph.Text))
+                continue;
+
+            if (IsCenteredOrRightAligned(context, paragraph.Paragraph))
+                continue;
+
+            if (_paragraphClassifier.IsListItem(paragraph.Paragraph))
+                continue;
+
+            var preview = TextExtractor.Truncate(paragraph.Text, 50);
+            if (StartsWithTabCharacter(paragraph.Paragraph))
+            {
+                var message =
+                    $"Paragraph uses TAB character for indent instead of proper first-line indent formatting. Please use paragraph formatting ({FormatAllowedIndents(options)} first-line indent) instead of TAB.";
+
+                yield return CreateProblem(message, paragraph, preview);
+                continue;
+            }
+
+            var firstLineIndent = _formattingResolver.ResolveFirstLineIndent(
+                context.RawDocument,
+                paragraph.Paragraph);
+
+            if (IsValidIndent(firstLineIndent, allowedIndentsTwips, options.ToleranceTwips))
+                continue;
+
+            var actualIndentCm = firstLineIndent / UnitConversion.TwipsPerCm;
+            var indentMessage =
+                $"Paragraph has incorrect first line indent: {actualIndentCm:F2} cm. Expected {FormatAllowedIndents(options)}.";
+
+            yield return CreateProblem(indentMessage, paragraph, preview);
+        }
+    }
+
+    private static RuleProblem CreateProblem(
+        string message,
+        ParagraphNode paragraph,
+        string preview)
+    {
+        return new RuleProblem(
+            message,
+            new DocumentLocation
+            {
+                Paragraph = paragraph.BodyIndex,
+                Text = preview
+            },
+            ParagraphIndexKind.BodyElement,
+            new ParagraphAnnotationTarget(paragraph.Paragraph));
+    }
+
+    private static bool IsValidIndent(int actualTwips, int[] allowedTwips, int toleranceTwips)
+    {
+        return allowedTwips.Any(allowed => Math.Abs(actualTwips - allowed) <= toleranceTwips);
+    }
+
+    private static string FormatAllowedIndents(ParagraphIndentRuleOptions options)
+    {
+        var allowedIndentsTwips = options.AllowedIndentTwips ?? [];
+        return allowedIndentsTwips.Length == 0
+            ? "a configured indent"
+            : string.Join(" or ", allowedIndentsTwips.Select(indent => $"{indent / UnitConversion.TwipsPerCm:F2} cm"));
+    }
+
+    private static bool StartsWithTabCharacter(Paragraph paragraph)
+    {
+        foreach (var child in paragraph.Descendants())
+        {
+            if (child is TabChar)
+                return true;
+
+            if (child is Text text)
+            {
+                var textDecision = StartsWithTextTab(text.Text);
+                if (textDecision.HasValue)
+                    return textDecision.Value;
+            }
+        }
+
+        return false;
+    }
+
+    private static bool? StartsWithTextTab(string? text)
+    {
+        if (string.IsNullOrEmpty(text))
+            return null;
+
+        foreach (var ch in text)
+        {
+            if (ch == '\t')
+                return true;
+
+            if (!char.IsWhiteSpace(ch) && !char.IsControl(ch))
+                return false;
+        }
+
+        return null;
+    }
+
+    private bool IsCenteredOrRightAligned(RuleContext context, Paragraph paragraph)
+    {
+        var justification = _formattingResolver.ResolveJustification(context.RawDocument, paragraph);
+        return justification == JustificationValues.Center || justification == JustificationValues.Right;
+    }
+}
diff --git a/src/backend/Rules/Layout/ParagraphIndentRule/ParagraphIndentRuleOptions.cs b/src/backend/Rules/Layout/ParagraphIndentRule/ParagraphIndentRuleOptions.cs
new file mode 100644
index 0000000..8b052f0
--- /dev/null
+++ b/src/backend/Rules/Layout/ParagraphIndentRule/ParagraphIndentRuleOptions.cs
@@ -0,0 +1,10 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class ParagraphIndentRuleOptions : RuleOptionsBase
+{
+    public int[] AllowedIndentTwips { get; set; } = [567, 709];
+
+    public int ToleranceTwips { get; set; } = 60;
+}
diff --git a/src/backend/Rules/Layout/ParagraphSpacingRule/ParagraphSpacingRule.cs b/src/backend/Rules/Layout/ParagraphSpacingRule/ParagraphSpacingRule.cs
new file mode 100644
index 0000000..bee9890
--- /dev/null
+++ b/src/backend/Rules/Layout/ParagraphSpacingRule/ParagraphSpacingRule.cs
@@ -0,0 +1,74 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Formatting;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class ParagraphSpacingRule : ValidationRule<ParagraphSpacingRuleOptions>
+{
+    public const string RuleId = nameof(ParagraphSpacingRule);
+
+    private readonly FormattingResolver _formattingResolver;
+    private readonly ParagraphClassifier _paragraphClassifier;
+
+    public ParagraphSpacingRule(
+        FormattingResolver? formattingResolver = null,
+        ParagraphClassifier? paragraphClassifier = null)
+    {
+        _formattingResolver = formattingResolver ?? new FormattingResolver();
+        _paragraphClassifier = paragraphClassifier ?? new ParagraphClassifier();
+    }
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Paragraph Spacing",
+        Description: "Finds body paragraphs whose spacing after value is not allowed.",
+        Category: RuleCategories.Layout,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        ParagraphSpacingRuleOptions options)
+    {
+        var allowedSpacingTwips = options.AllowedSpacingPoints
+            .Select(UnitConversion.PointsToTwips)
+            .ToHashSet();
+
+        foreach (var paragraph in context.Content.BodyChildParagraphs)
+        {
+            if (paragraph.IsHeading)
+                continue;
+
+            if (_paragraphClassifier.HasExcludedStructuralStyle(context.RawDocument, paragraph.Paragraph))
+                continue;
+
+            var spacingAfter = _formattingResolver.ResolveSpacingAfter(
+                context.RawDocument,
+                paragraph.Paragraph);
+            var preview = TextExtractor.Truncate(paragraph.Text, 50);
+
+            if (allowedSpacingTwips.Contains(spacingAfter) || string.IsNullOrWhiteSpace(preview))
+                continue;
+
+            var expectedPts = string.Join(" or ", options.AllowedSpacingPoints.Select(pt => $"{pt}pt"));
+            var actualPt = UnitConversion.TwipsToPoints(spacingAfter);
+            var message =
+                $"Paragraph has incorrect spacing. After value: {actualPt:F1}pt ({spacingAfter} twips). Expected {expectedPts}.";
+
+            yield return new RuleProblem(
+                message,
+                new DocumentLocation
+                {
+                    Paragraph = paragraph.BodyIndex,
+                    Text = preview
+                },
+                ParagraphIndexKind.BodyElement,
+                new ParagraphAnnotationTarget(paragraph.Paragraph));
+        }
+    }
+}
diff --git a/src/backend/Rules/Layout/ParagraphSpacingRule/ParagraphSpacingRuleOptions.cs b/src/backend/Rules/Layout/ParagraphSpacingRule/ParagraphSpacingRuleOptions.cs
new file mode 100644
index 0000000..ad15a5b
--- /dev/null
+++ b/src/backend/Rules/Layout/ParagraphSpacingRule/ParagraphSpacingRuleOptions.cs
@@ -0,0 +1,8 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class ParagraphSpacingRuleOptions : RuleOptionsBase
+{
+    public int[] AllowedSpacingPoints { get; set; } = [0, 6];
+}
diff --git a/src/backend/Rules/Structure/EmptySectionStructureRule/EmptySectionStructureRule.cs b/src/backend/Rules/Structure/EmptySectionStructureRule/EmptySectionStructureRule.cs
new file mode 100644
index 0000000..d84ea1a
--- /dev/null
+++ b/src/backend/Rules/Structure/EmptySectionStructureRule/EmptySectionStructureRule.cs
@@ -0,0 +1,72 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Content;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// A subchapter heading (e.g. Heading 2) cannot immediately follow its parent
+/// chapter heading (e.g. Heading 1) without any intervening body text.
+/// Every section must contain at least a brief introductory paragraph
+/// before the first sub-section begins.
+/// </summary>
+public sealed class EmptySectionStructureRule : ValidationRule<EmptySectionStructureRuleOptions>
+{
+    public const string RuleId = "EmptySectionStructureRule";
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Empty Sections",
+        Description: "Finds headings/sections with no content.",
+        Category: RuleCategories.Language,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        EmptySectionStructureRuleOptions options)
+    {
+        foreach (var section in FlattenSections(context.Content.Sections))
+        {
+            var firstChild = section.Children.FirstOrDefault();
+            if (firstChild is null || section.HasIntroductoryContent)
+                continue;
+
+            var parentTitle = TextExtractor.Truncate(section.Title, 60);
+            var childTitle = TextExtractor.Truncate(firstChild.Title, 50);
+
+            var message =
+                $"Heading {section.Level} \"{parentTitle}\" " +
+                $"is immediately followed by Heading {firstChild.Level} \"{childTitle}\" " +
+                "with no introductory text. Add at least one paragraph of body text " +
+                "before the first sub-section.";
+
+            yield return new RuleProblem(
+                message,
+                new DocumentLocation
+                {
+                    Paragraph = section.Heading.BodyIndex,
+                    Text = parentTitle
+                },
+                ParagraphIndexKind.BodyElement,
+                new ParagraphAnnotationTarget(section.Heading.Paragraph));
+        }
+    }
+
+    private static IEnumerable<SectionNode> FlattenSections(IEnumerable<SectionNode> sections)
+    {
+        foreach (var section in sections)
+        {
+            yield return section;
+
+            foreach (var child in FlattenSections(section.Children))
+            {
+                yield return child;
+            }
+        }
+    }
+}
diff --git a/src/backend/Rules/Structure/EmptySectionStructureRule/EmptySectionStructureRuleOptions.cs b/src/backend/Rules/Structure/EmptySectionStructureRule/EmptySectionStructureRuleOptions.cs
new file mode 100644
index 0000000..2ecda79
--- /dev/null
+++ b/src/backend/Rules/Structure/EmptySectionStructureRule/EmptySectionStructureRuleOptions.cs
@@ -0,0 +1,5 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class EmptySectionStructureRuleOptions : RuleOptionsBase;
diff --git a/src/backend/Rules/Structure/FigureCaptionFormatRule/FigureCaptionFormatRule.cs b/src/backend/Rules/Structure/FigureCaptionFormatRule/FigureCaptionFormatRule.cs
new file mode 100644
index 0000000..11bc8e0
--- /dev/null
+++ b/src/backend/Rules/Structure/FigureCaptionFormatRule/FigureCaptionFormatRule.cs
@@ -0,0 +1,65 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Figures;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// Validates the visible text format of existing figure captions.
+/// </summary>
+public sealed class FigureCaptionFormatRule : ValidationRule<FigureCaptionFormatRuleOptions>
+{
+    public const string RuleId = nameof(FigureCaptionFormatRule);
+
+    private readonly FigureCaptionAnalyzer _figureCaptionAnalyzer = new();
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Figure Caption Format",
+        Description: "Finds figure captions whose visible text has an invalid format.",
+        Category: RuleCategories.Structure,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        FigureCaptionFormatRuleOptions options)
+    {
+        foreach (var caption in _figureCaptionAnalyzer.GetDetectedFigureCaptions(context))
+        {
+            var text = caption.Text.Trim();
+            var preview = TextExtractor.Truncate(text, 50);
+
+            if (!CaptionDetection.HasValidFigureCaptionFormat(text))
+            {
+                yield return new RuleProblem(
+                    "Figure caption has invalid format - use a label such as \"Rys.\" or \"Rysunek\", a number, and a description.",
+                    new DocumentLocation
+                    {
+                        Paragraph = caption.ParagraphIndex,
+                        Text = preview
+                    },
+                    ParagraphIndexKind.BodyElement,
+                    new ParagraphAnnotationTarget(caption.Paragraph));
+                continue;
+            }
+
+            if (CaptionDetection.EndsWithSinglePeriod(text))
+            {
+                yield return new RuleProblem(
+                    "Figure caption should not end with a period.",
+                    new DocumentLocation
+                    {
+                        Paragraph = caption.ParagraphIndex,
+                        Text = preview
+                    },
+                    ParagraphIndexKind.BodyElement,
+                    new ParagraphAnnotationTarget(caption.Paragraph));
+            }
+        }
+    }
+}
diff --git a/src/backend/Rules/Structure/FigureCaptionFormatRule/FigureCaptionFormatRuleOptions.cs b/src/backend/Rules/Structure/FigureCaptionFormatRule/FigureCaptionFormatRuleOptions.cs
new file mode 100644
index 0000000..2bf8083
--- /dev/null
+++ b/src/backend/Rules/Structure/FigureCaptionFormatRule/FigureCaptionFormatRuleOptions.cs
@@ -0,0 +1,5 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class FigureCaptionFormatRuleOptions : RuleOptionsBase;
diff --git a/src/backend/Rules/Structure/FigureCaptionPositionRule/FigureCaptionPositionRule.cs b/src/backend/Rules/Structure/FigureCaptionPositionRule/FigureCaptionPositionRule.cs
new file mode 100644
index 0000000..0bf15ad
--- /dev/null
+++ b/src/backend/Rules/Structure/FigureCaptionPositionRule/FigureCaptionPositionRule.cs
@@ -0,0 +1,60 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Figures;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// Validates that an existing figure caption is placed below its figure.
+/// </summary>
+public sealed class FigureCaptionPositionRule : ValidationRule<FigureCaptionPositionRuleOptions>
+{
+    public const string RuleId = nameof(FigureCaptionPositionRule);
+
+    private readonly FigureCaptionAnalyzer _figureCaptionAnalyzer;
+
+    public FigureCaptionPositionRule(FigureCaptionAnalyzer? figureCaptionAnalyzer = null)
+    {
+        _figureCaptionAnalyzer = figureCaptionAnalyzer ?? new FigureCaptionAnalyzer();
+    }
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Figure Caption Position",
+        Description: "Finds figure captions that are above or separated from their figure.",
+        Category: RuleCategories.Structure,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        FigureCaptionPositionRuleOptions options)
+    {
+        foreach (var association in _figureCaptionAnalyzer.AssociateFiguresWithCaptions(
+                     context,
+                     requireStructuredCaption: true))
+        {
+            if (association.Caption is null || association.IsCaptionBelowFigure)
+                continue;
+
+            var preview = TextExtractor.Truncate(association.Caption.Text, 50);
+            var message = association.Relation == FigureCaptionRelationKind.Above
+                ? "Figure caption should be placed below the figure."
+                : "Figure caption should be placed directly below the figure without intervening content.";
+
+            yield return new RuleProblem(
+                message,
+                new DocumentLocation
+                {
+                    Paragraph = association.Caption.ParagraphIndex,
+                    Text = preview
+                },
+                ParagraphIndexKind.BodyElement,
+                new ParagraphAnnotationTarget(association.Caption.Paragraph));
+        }
+    }
+}
diff --git a/src/backend/Rules/Structure/FigureCaptionPositionRule/FigureCaptionPositionRuleOptions.cs b/src/backend/Rules/Structure/FigureCaptionPositionRule/FigureCaptionPositionRuleOptions.cs
new file mode 100644
index 0000000..166a6c8
--- /dev/null
+++ b/src/backend/Rules/Structure/FigureCaptionPositionRule/FigureCaptionPositionRuleOptions.cs
@@ -0,0 +1,5 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class FigureCaptionPositionRuleOptions : RuleOptionsBase;
diff --git a/src/backend/Rules/Structure/FigureCaptionStyleRule/FigureCaptionStyleRule.cs b/src/backend/Rules/Structure/FigureCaptionStyleRule/FigureCaptionStyleRule.cs
new file mode 100644
index 0000000..bb6cbc2
--- /dev/null
+++ b/src/backend/Rules/Structure/FigureCaptionStyleRule/FigureCaptionStyleRule.cs
@@ -0,0 +1,119 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Figures;
+using DocumentFormat.OpenXml.Wordprocessing;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// Validates the Word style and paragraph formatting of existing figure captions.
+/// </summary>
+public sealed class FigureCaptionStyleRule : ValidationRule<FigureCaptionStyleRuleOptions>
+{
+    public const string RuleId = nameof(FigureCaptionStyleRule);
+
+    private const double ExpectedFontSizePt = 11.0;
+    private const int IndentToleranceTwips = 10;
+
+    private readonly FormattingResolver _formattingResolver = new();
+    private readonly FigureCaptionAnalyzer _figureCaptionAnalyzer = new();
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Figure Caption Style",
+        Description: "Finds figure captions that do not use the expected style, alignment, font size, or indentation.",
+        Category: RuleCategories.Structure,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        FigureCaptionStyleRuleOptions options)
+    {
+        foreach (var captionCandidate in _figureCaptionAnalyzer.GetDetectedFigureCaptions(context))
+        {
+            var caption = captionCandidate.Paragraph;
+            var preview = TextExtractor.Truncate(captionCandidate.Text, 50);
+
+            if (!CaptionDetection.UsesDedicatedCaptionStyle(context.RawDocument, caption))
+            {
+                var label = CaptionDetection.GetCaptionStyleLabel(context.RawDocument, caption);
+                yield return new RuleProblem(
+                    $"Figure caption uses \"{label}\" style - assign a Caption style (e.g., \"Caption\", \"Legenda\").",
+                    new DocumentLocation
+                    {
+                        Paragraph = captionCandidate.ParagraphIndex,
+                        Text = preview
+                    },
+                    ParagraphIndexKind.BodyElement,
+                    new ParagraphAnnotationTarget(captionCandidate.Paragraph));
+            }
+
+            var textRun = caption.Elements<Run>()
+                .FirstOrDefault(run => !string.IsNullOrWhiteSpace(TextExtractor.GetRunText(run)));
+            if (textRun is not null)
+            {
+                var pt = _formattingResolver.ResolveFontSizePt(
+                    context.RawDocument,
+                    caption,
+                    textRun);
+                if (pt is not null && Math.Abs(pt.Value - ExpectedFontSizePt) > 0.01)
+                {
+                    yield return new RuleProblem(
+                        $"Figure caption font size must be 11pt, found {pt:0.##}pt.",
+                        new DocumentLocation
+                        {
+                            Paragraph = captionCandidate.ParagraphIndex,
+                            Text = preview
+                        },
+                        ParagraphIndexKind.BodyElement,
+                        new ParagraphAnnotationTarget(captionCandidate.Paragraph));
+                }
+            }
+
+            var justification = _formattingResolver.ResolveJustification(
+                context.RawDocument,
+                caption,
+                includeDefaultStyle: false);
+            if (justification != JustificationValues.Center)
+            {
+                var name = justification == JustificationValues.Right
+                    ? "right-aligned"
+                    : justification == JustificationValues.Both
+                        ? "justified"
+                        : "left-aligned";
+
+                yield return new RuleProblem(
+                    $"Figure caption must be centered, found {name}.",
+                    new DocumentLocation
+                    {
+                        Paragraph = captionCandidate.ParagraphIndex,
+                        Text = preview
+                    },
+                    ParagraphIndexKind.BodyElement,
+                    new ParagraphAnnotationTarget(captionCandidate.Paragraph));
+            }
+
+            var (left, firstLine) = _formattingResolver.ResolveIndentation(
+                context.RawDocument,
+                caption,
+                includeDefaultStyle: false);
+            if (Math.Abs(left) > IndentToleranceTwips || Math.Abs(firstLine) > IndentToleranceTwips)
+            {
+                yield return new RuleProblem(
+                    $"Figure caption must have no indentation (left: {left / UnitConversion.TwipsPerCm:F2}cm, first-line: {firstLine / UnitConversion.TwipsPerCm:F2}cm).",
+                    new DocumentLocation
+                    {
+                        Paragraph = captionCandidate.ParagraphIndex,
+                        Text = preview
+                    },
+                    ParagraphIndexKind.BodyElement,
+                    new ParagraphAnnotationTarget(captionCandidate.Paragraph));
+            }
+        }
+    }
+}
diff --git a/src/backend/Rules/Structure/FigureCaptionStyleRule/FigureCaptionStyleRuleOptions.cs b/src/backend/Rules/Structure/FigureCaptionStyleRule/FigureCaptionStyleRuleOptions.cs
new file mode 100644
index 0000000..2f0d951
--- /dev/null
+++ b/src/backend/Rules/Structure/FigureCaptionStyleRule/FigureCaptionStyleRuleOptions.cs
@@ -0,0 +1,5 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class FigureCaptionStyleRuleOptions : RuleOptionsBase;
diff --git a/src/backend/Rules/Structure/HeadingStyleUsageRule/HeadingStyleUsageRule.cs b/src/backend/Rules/Structure/HeadingStyleUsageRule/HeadingStyleUsageRule.cs
new file mode 100644
index 0000000..9129796
--- /dev/null
+++ b/src/backend/Rules/Structure/HeadingStyleUsageRule/HeadingStyleUsageRule.cs
@@ -0,0 +1,112 @@
+using backend.DocumentProcessing.Context;
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Figures;
+using DocumentFormat.OpenXml.Wordprocessing;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// Detects paragraphs that look manually formatted as headings without using a Heading style.
+/// </summary>
+public sealed class HeadingStyleUsageRule : ValidationRule<HeadingStyleUsageRuleOptions>
+{
+    public const string RuleId = nameof(HeadingStyleUsageRule);
+
+    private const double DefaultBodyFontSizePt = 12.0;
+
+    private readonly FormattingResolver _formattingResolver;
+    private readonly ParagraphClassifier _paragraphClassifier;
+
+    public HeadingStyleUsageRule(
+        FormattingResolver? formattingResolver = null,
+        ParagraphClassifier? paragraphClassifier = null)
+    {
+        _formattingResolver = formattingResolver ?? new FormattingResolver();
+        _paragraphClassifier = paragraphClassifier ?? new ParagraphClassifier();
+    }
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Heading Style Usage",
+        Description: "Finds paragraphs that look like manually formatted headings.",
+        Category: RuleCategories.Structure,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Warning);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        HeadingStyleUsageRuleOptions options)
+    {
+        var thresholdPt = DefaultBodyFontSizePt + options.FontSizeThresholdAboveBodyPt;
+
+        foreach (var paragraph in context.Content.BodyChildParagraphs)
+        {
+            if (paragraph.IsHeading || HeadingDetection.IsHeading(context.RawDocument, paragraph.Paragraph))
+                continue;
+
+            if (_paragraphClassifier.HasExcludedStructuralStyle(context.RawDocument, paragraph.Paragraph))
+                continue;
+
+            var text = paragraph.Text.Trim();
+            if (string.IsNullOrWhiteSpace(text) || text.Length > options.MaxHeadingTextLength)
+                continue;
+
+            if (!LooksLikeManualHeading(context, paragraph.Paragraph, thresholdPt))
+                continue;
+
+            var preview = TextExtractor.Truncate(text, 60);
+            var message =
+                "Paragraph appears manually formatted as a heading - " +
+                "apply a proper Heading style (Heading 1, Heading 2, etc.) " +
+                "instead of manual bold/font-size formatting.";
+
+            yield return new RuleProblem(
+                message,
+                new DocumentLocation
+                {
+                    Paragraph = paragraph.BodyIndex,
+                    Text = preview
+                },
+                ParagraphIndexKind.BodyElement,
+                new ParagraphAnnotationTarget(paragraph.Paragraph));
+        }
+    }
+
+    private bool LooksLikeManualHeading(
+        RuleContext context,
+        Paragraph paragraph,
+        double fontSizeThresholdPt)
+    {
+        var runs = paragraph.Elements<Run>()
+            .Where(run => !string.IsNullOrWhiteSpace(GetRunText(run)))
+            .ToList();
+
+        if (runs.Count == 0)
+            return false;
+
+        var allBold = true;
+        var hasLargeFont = false;
+
+        foreach (var run in runs)
+        {
+            if (!_formattingResolver.IsRunBold(context.RawDocument, paragraph, run))
+                allBold = false;
+
+            var fontSizePt = _formattingResolver.ResolveFontSizePt(context.RawDocument, paragraph, run);
+            if (fontSizePt is not null && fontSizePt >= fontSizeThresholdPt)
+                hasLargeFont = true;
+        }
+
+        return allBold && hasLargeFont;
+    }
+
+    private static string GetRunText(Run run)
+    {
+        return string.Concat(run.Elements<Text>().Select(text => text.Text));
+    }
+}
diff --git a/src/backend/Rules/Structure/HeadingStyleUsageRule/HeadingStyleUsageRuleOptions.cs b/src/backend/Rules/Structure/HeadingStyleUsageRule/HeadingStyleUsageRuleOptions.cs
new file mode 100644
index 0000000..aa649c8
--- /dev/null
+++ b/src/backend/Rules/Structure/HeadingStyleUsageRule/HeadingStyleUsageRuleOptions.cs
@@ -0,0 +1,10 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class HeadingStyleUsageRuleOptions : RuleOptionsBase
+{
+    public int FontSizeThresholdAboveBodyPt { get; set; } = 2;
+
+    public int MaxHeadingTextLength { get; set; } = 200;
+}
diff --git a/src/backend/Rules/Structure/HierarchyDepthRule/HierarchyDepthRule.cs b/src/backend/Rules/Structure/HierarchyDepthRule/HierarchyDepthRule.cs
new file mode 100644
index 0000000..5dc2569
--- /dev/null
+++ b/src/backend/Rules/Structure/HierarchyDepthRule/HierarchyDepthRule.cs
@@ -0,0 +1,51 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Content;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// The division of the work cannot be deeper than the configured heading level.
+/// </summary>
+public sealed class HierarchyDepthRule : ValidationRule<HierarchyDepthRuleOptions>
+{
+    public const string RuleId = nameof(HierarchyDepthRule);
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Heading Hierarchy",
+        Description: "Finds heading levels deeper than the configured maximum.",
+        Category: RuleCategories.Structure,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        HierarchyDepthRuleOptions options)
+    {
+        foreach (var paragraph in context.Content.BodyChildParagraphs)
+        {
+            var level = paragraph.HeadingLevel;
+            if (level is null || level <= options.MaxAllowedLevel)
+                continue;
+
+            var preview = TextExtractor.Truncate(paragraph.Text, 60);
+            var message =
+                $"Structure too deep. Detected Level {level}, but maximum allowed is {options.MaxAllowedLevel}.";
+
+            yield return new RuleProblem(
+                message,
+                new DocumentLocation
+                {
+                    Paragraph = paragraph.BodyIndex,
+                    Text = preview
+                },
+                ParagraphIndexKind.BodyElement,
+                new ParagraphAnnotationTarget(paragraph.Paragraph));
+        }
+    }
+}
diff --git a/src/backend/Rules/Structure/HierarchyDepthRule/HierarchyDepthRuleOptions.cs b/src/backend/Rules/Structure/HierarchyDepthRule/HierarchyDepthRuleOptions.cs
new file mode 100644
index 0000000..97b8502
--- /dev/null
+++ b/src/backend/Rules/Structure/HierarchyDepthRule/HierarchyDepthRuleOptions.cs
@@ -0,0 +1,8 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class HierarchyDepthRuleOptions : RuleOptionsBase
+{
+    public int MaxAllowedLevel { get; set; } = 3;
+}
diff --git a/src/backend/Rules/Structure/ManualTableOfContentsRule/ManualTableOfContentsRule.cs b/src/backend/Rules/Structure/ManualTableOfContentsRule/ManualTableOfContentsRule.cs
new file mode 100644
index 0000000..9af8338
--- /dev/null
+++ b/src/backend/Rules/Structure/ManualTableOfContentsRule/ManualTableOfContentsRule.cs
@@ -0,0 +1,47 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Figures;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class ManualTableOfContentsRule : ValidationRule<ManualTableOfContentsRuleOptions>
+{
+    public const string RuleId = "ManualTableOfContents";
+
+    private const string ManualTableOfContentsMessage =
+        "A table of contents section was detected, but no automatic Word TOC field was found. The table of contents was probably created manually and may become inconsistent with the document structure.";
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Manual Table of Contents",
+        Description: "Finds manually created table-of-contents sections.",
+        Category: RuleCategories.Structure,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Warning);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        ManualTableOfContentsRuleOptions options)
+    {
+        var detection = TableOfContentsDetector.Detect(context.RawDocument);
+        if (detection.Kind != TableOfContentsKind.Manual)
+            return [];
+
+        return
+        [
+            new RuleProblem(
+                ManualTableOfContentsMessage,
+                new DocumentLocation
+                {
+                    Paragraph = detection.ParagraphIndex,
+                    Text = TextExtractor.Truncate(detection.Text ?? string.Empty, 80)
+                },
+                ParagraphIndexKind.Descendant,
+                detection.Paragraph is null ? null : new ParagraphAnnotationTarget(detection.Paragraph))
+        ];
+    }
+}
diff --git a/src/backend/Rules/Structure/ManualTableOfContentsRule/ManualTableOfContentsRuleOptions.cs b/src/backend/Rules/Structure/ManualTableOfContentsRule/ManualTableOfContentsRuleOptions.cs
new file mode 100644
index 0000000..dc73833
--- /dev/null
+++ b/src/backend/Rules/Structure/ManualTableOfContentsRule/ManualTableOfContentsRuleOptions.cs
@@ -0,0 +1,5 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class ManualTableOfContentsRuleOptions : RuleOptionsBase;
diff --git a/src/backend/Rules/Structure/MissingFigureCaptionRule/MissingFigureCaptionRule.cs b/src/backend/Rules/Structure/MissingFigureCaptionRule/MissingFigureCaptionRule.cs
new file mode 100644
index 0000000..ee21602
--- /dev/null
+++ b/src/backend/Rules/Structure/MissingFigureCaptionRule/MissingFigureCaptionRule.cs
@@ -0,0 +1,56 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Content;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+/// <summary>
+/// Detects figure-like objects that do not have a nearby figure caption.
+/// </summary>
+public sealed class MissingFigureCaptionRule : ValidationRule<MissingFigureCaptionRuleOptions>
+{
+    public const string RuleId = nameof(MissingFigureCaptionRule);
+
+    private readonly FigureCaptionAnalyzer _figureCaptionAnalyzer;
+
+    public MissingFigureCaptionRule(FigureCaptionAnalyzer? figureCaptionAnalyzer = null)
+    {
+        _figureCaptionAnalyzer = figureCaptionAnalyzer ?? new FigureCaptionAnalyzer();
+    }
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Missing Figure Captions",
+        Description: "Finds figures without a nearby structured figure caption.",
+        Category: RuleCategories.Structure,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        MissingFigureCaptionRuleOptions options)
+    {
+        foreach (var association in _figureCaptionAnalyzer.AssociateFiguresWithCaptions(
+                     context,
+                     requireStructuredCaption: true))
+        {
+            if (association.HasCaption)
+                continue;
+
+            var message = "Figure has no caption - add a figure caption below the figure.";
+            yield return new RuleProblem(
+                message,
+                new DocumentLocation
+                {
+                    Paragraph = association.Figure.ParagraphIndex,
+                    Text = "[Figure]"
+                },
+                ParagraphIndexKind.BodyElement,
+                new ParagraphAnnotationTarget(association.Figure.Paragraph));
+        }
+    }
+}
diff --git a/src/backend/Rules/Structure/MissingFigureCaptionRule/MissingFigureCaptionRuleOptions.cs b/src/backend/Rules/Structure/MissingFigureCaptionRule/MissingFigureCaptionRuleOptions.cs
new file mode 100644
index 0000000..4323091
--- /dev/null
+++ b/src/backend/Rules/Structure/MissingFigureCaptionRule/MissingFigureCaptionRuleOptions.cs
@@ -0,0 +1,5 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class MissingFigureCaptionRuleOptions : RuleOptionsBase;
diff --git a/src/backend/Rules/Structure/TocRule/TocRule.cs b/src/backend/Rules/Structure/TocRule/TocRule.cs
new file mode 100644
index 0000000..00a65ae
--- /dev/null
+++ b/src/backend/Rules/Structure/TocRule/TocRule.cs
@@ -0,0 +1,54 @@
+using backend.DocumentProcessing.TablesOfContents;
+using backend.DocumentProcessing.Paragraphs;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Figures;
+using DocumentFormat.OpenXml.Wordprocessing;
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class TocRule : ValidationRule<TocRuleOptions>
+{
+    public const string RuleId = "CheckTableOfContents";
+
+    public override RuleDescriptor Descriptor => new(
+        Name: RuleId,
+        DisplayName: "Automatic Table of Contents",
+        Description: "Finds documents that do not contain an automatic Word table of contents.",
+        Category: RuleCategories.Structure,
+        DefaultAvailability: RuleAvailability.Available,
+        DefaultSeverity: RuleSeverity.Error);
+
+    public override IEnumerable<RuleProblem> Validate(
+        RuleContext context,
+        TocRuleOptions options)
+    {
+        var detection = TableOfContentsDetector.Detect(context.RawDocument);
+        if (detection.Kind == TableOfContentsKind.Automatic)
+            return [];
+
+        var body = context.RawDocument.MainDocumentPart?.Document.Body;
+        var firstRun = body?.Descendants<Run>().FirstOrDefault();
+
+        return
+        [
+            new RuleProblem(
+                "Document is missing an automatic Word Table of Contents.",
+                new DocumentLocation(),
+                ParagraphIndexKind.BodyElement,
+                firstRun is null ? null : new RunAnnotationTarget(firstRun))
+        ];
+    }
+
+    public static TableOfContentsDetection DetectTableOfContents(RuleContext context)
+    {
+        return TableOfContentsDetector.Detect(context.RawDocument);
+    }
+
+    public static bool IsTableOfContentsHeadingText(string text)
+    {
+        return TableOfContentsDetector.IsTableOfContentsHeadingText(text);
+    }
+}
diff --git a/src/backend/Rules/Structure/TocRule/TocRuleOptions.cs b/src/backend/Rules/Structure/TocRule/TocRuleOptions.cs
new file mode 100644
index 0000000..dcbf92d
--- /dev/null
+++ b/src/backend/Rules/Structure/TocRule/TocRuleOptions.cs
@@ -0,0 +1,5 @@
+using ThesisValidator.Rules;
+
+namespace backend.Rules;
+
+public sealed class TocRuleOptions : RuleOptionsBase;
diff --git a/backend/backend.csproj b/src/backend/ThesisValidator.Api.csproj
similarity index 100%
rename from backend/backend.csproj
rename to src/backend/ThesisValidator.Api.csproj
diff --git a/backend/appsettings.Development.json b/src/backend/appsettings.Development.json
similarity index 60%
rename from backend/appsettings.Development.json
rename to src/backend/appsettings.Development.json
index 0c208ae..6cb583a 100644
--- a/backend/appsettings.Development.json
+++ b/src/backend/appsettings.Development.json
@@ -4,5 +4,10 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
+  },
+  "Cors": {
+    "AllowedOrigins": [
+      "http://localhost:4200"
+    ]
   }
 }
diff --git a/src/backend/appsettings.json b/src/backend/appsettings.json
new file mode 100644
index 0000000..edc206f
--- /dev/null
+++ b/src/backend/appsettings.json
@@ -0,0 +1,134 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*",
+  "Validation": {
+    "Skipping": {
+      "SkipBeforeTableOfContents": true,
+      "SkipTextBoxes": true,
+      "SkipTableOfContentsContent": true
+    },
+    "Rules": {
+      "EmptySectionStructureRule": {
+        "Availability": "Available",
+        "Severity": "Error"
+      },
+      "FontFamilyRule": {
+        "Availability": "Available",
+        "Severity": "Warning",
+        "RequiredFontFamily": "Times New Roman"
+      },
+      "SingleSpaceRule": {
+        "Availability": "Available",
+        "Severity": "Error"
+      },
+      "TextJustificationRule": {
+        "Availability": "Available",
+        "Severity": "Error"
+      },
+      "NoDotsInTitlesRule": {
+        "Availability": "Available",
+        "Severity": "Error",
+        "TargetStylePatterns": [
+          "heading",
+          "nagwek",
+          "title",
+          "tytu",
+          "subtitle",
+          "podtytu",
+          "caption",
+          "podpis"
+        ]
+      },
+      "HeadingStyleUsageRule": {
+        "Availability": "Available",
+        "Severity": "Warning",
+        "FontSizeThresholdAboveBodyPt": 2,
+        "MaxHeadingTextLength": 200
+      },
+      "HierarchyDepthRule": {
+        "Availability": "Available",
+        "Severity": "Error",
+        "MaxAllowedLevel": 3
+      },
+      "LineSpacingDependencyRule": {
+        "Availability": "Available",
+        "Severity": "Error",
+        "TargetLineSpacingTwips": 360
+      },
+      "ParagraphSpacingRule": {
+        "Availability": "Available",
+        "Severity": "Error",
+        "AllowedSpacingPoints": [0, 6]
+      },
+      "RequiredIndentCm": {
+        "Availability": "Available",
+        "Severity": "Error",
+        "AllowedIndentTwips": [567, 709],
+        "ToleranceTwips": 60
+      },
+      "CheckTableOfContents": {
+        "Availability": "Available",
+        "Severity": "Error"
+      },
+      "ManualTableOfContents": {
+        "Availability": "Available",
+        "Severity": "Warning"
+      },
+      "MissingFigureCaptionRule": {
+        "Availability": "Available",
+        "Severity": "Error"
+      },
+      "FigureCaptionPositionRule": {
+        "Availability": "Available",
+        "Severity": "Error"
+      },
+      "FigureCaptionFormatRule": {
+        "Availability": "Available",
+        "Severity": "Error"
+      },
+      "FigureCaptionStyleRule": {
+        "Availability": "Available",
+        "Severity": "Error"
+      },
+      "Grammar": {
+        "Availability": "Available",
+        "Severity": "Error"
+      },
+      "ListPunctuationConsistencyRule": {
+        "Availability": "Available",
+        "Severity": "Error"
+      },
+      "ListIndentationConsistencyRule": {
+        "Availability": "Available",
+        "Severity": "Error"
+      }
+    },
+    "CodeBlockDetection": {
+      "MinimumCodeFontTextRatio": 0.7,
+      "RequireWholeParagraphMonospace": false,
+      "CodeFonts": [
+        "Consolas",
+        "Courier New",
+        "Courier",
+        "Lucida Console",
+        "Cascadia Code",
+        "Cascadia Mono",
+        "JetBrains Mono",
+        "Fira Code",
+        "Source Code Pro",
+        "Menlo",
+        "Monaco",
+        "DejaVu Sans Mono",
+        "Liberation Mono"
+      ]
+    }
+  },
+  "LanguageTool": {
+    "BaseUrl": "http://localhost:8010"
+  }
+}
diff --git a/frontend/.editorconfig b/src/frontend/.editorconfig
similarity index 100%
rename from frontend/.editorconfig
rename to src/frontend/.editorconfig
diff --git a/frontend/.gitignore b/src/frontend/.gitignore
similarity index 100%
rename from frontend/.gitignore
rename to src/frontend/.gitignore
diff --git a/frontend/README.md b/src/frontend/README.md
similarity index 100%
rename from frontend/README.md
rename to src/frontend/README.md
diff --git a/frontend/angular.json b/src/frontend/angular.json
similarity index 100%
rename from frontend/angular.json
rename to src/frontend/angular.json
diff --git a/frontend/package-lock.json b/src/frontend/package-lock.json
similarity index 100%
rename from frontend/package-lock.json
rename to src/frontend/package-lock.json
diff --git a/frontend/package.json b/src/frontend/package.json
similarity index 100%
rename from frontend/package.json
rename to src/frontend/package.json
diff --git a/frontend/postcss.config.js b/src/frontend/postcss.config.js
similarity index 100%
rename from frontend/postcss.config.js
rename to src/frontend/postcss.config.js
diff --git a/frontend/proxy.conf.json b/src/frontend/proxy.conf.json
similarity index 100%
rename from frontend/proxy.conf.json
rename to src/frontend/proxy.conf.json
diff --git a/frontend/public/favicon.ico b/src/frontend/public/favicon.ico
similarity index 100%
rename from frontend/public/favicon.ico
rename to src/frontend/public/favicon.ico
diff --git a/frontend/src/app/app.component.html b/src/frontend/src/app/app.component.html
similarity index 100%
rename from frontend/src/app/app.component.html
rename to src/frontend/src/app/app.component.html
diff --git a/frontend/src/app/app.component.ts b/src/frontend/src/app/app.component.ts
similarity index 100%
rename from frontend/src/app/app.component.ts
rename to src/frontend/src/app/app.component.ts
diff --git a/frontend/src/app/app.config.ts b/src/frontend/src/app/app.config.ts
similarity index 100%
rename from frontend/src/app/app.config.ts
rename to src/frontend/src/app/app.config.ts
diff --git a/frontend/src/app/app.routes.ts b/src/frontend/src/app/app.routes.ts
similarity index 100%
rename from frontend/src/app/app.routes.ts
rename to src/frontend/src/app/app.routes.ts
diff --git a/frontend/src/app/components/error-toast/error-toast.component.ts b/src/frontend/src/app/components/error-toast/error-toast.component.ts
similarity index 100%
rename from frontend/src/app/components/error-toast/error-toast.component.ts
rename to src/frontend/src/app/components/error-toast/error-toast.component.ts
diff --git a/frontend/src/app/components/file-upload/file-upload.component.ts b/src/frontend/src/app/components/file-upload/file-upload.component.ts
similarity index 100%
rename from frontend/src/app/components/file-upload/file-upload.component.ts
rename to src/frontend/src/app/components/file-upload/file-upload.component.ts
diff --git a/frontend/src/app/components/footer/footer.component.ts b/src/frontend/src/app/components/footer/footer.component.ts
similarity index 100%
rename from frontend/src/app/components/footer/footer.component.ts
rename to src/frontend/src/app/components/footer/footer.component.ts
diff --git a/frontend/src/app/components/header/header.component.ts b/src/frontend/src/app/components/header/header.component.ts
similarity index 100%
rename from frontend/src/app/components/header/header.component.ts
rename to src/frontend/src/app/components/header/header.component.ts
diff --git a/frontend/src/app/components/rule-selector/rule-category-group.component.ts b/src/frontend/src/app/components/rule-selector/rule-category-group.component.ts
similarity index 100%
rename from frontend/src/app/components/rule-selector/rule-category-group.component.ts
rename to src/frontend/src/app/components/rule-selector/rule-category-group.component.ts
diff --git a/frontend/src/app/components/rule-selector/rule-checkbox.component.ts b/src/frontend/src/app/components/rule-selector/rule-checkbox.component.ts
similarity index 100%
rename from frontend/src/app/components/rule-selector/rule-checkbox.component.ts
rename to src/frontend/src/app/components/rule-selector/rule-checkbox.component.ts
diff --git a/frontend/src/app/components/rule-selector/rule-selector.component.ts b/src/frontend/src/app/components/rule-selector/rule-selector.component.ts
similarity index 100%
rename from frontend/src/app/components/rule-selector/rule-selector.component.ts
rename to src/frontend/src/app/components/rule-selector/rule-selector.component.ts
diff --git a/frontend/src/app/components/validation-progress/validation-progress.component.ts b/src/frontend/src/app/components/validation-progress/validation-progress.component.ts
similarity index 100%
rename from frontend/src/app/components/validation-progress/validation-progress.component.ts
rename to src/frontend/src/app/components/validation-progress/validation-progress.component.ts
diff --git a/frontend/src/app/components/validation-results/result-all-clear.component.ts b/src/frontend/src/app/components/validation-results/result-all-clear.component.ts
similarity index 100%
rename from frontend/src/app/components/validation-results/result-all-clear.component.ts
rename to src/frontend/src/app/components/validation-results/result-all-clear.component.ts
diff --git a/frontend/src/app/components/validation-results/result-category-group.component.ts b/src/frontend/src/app/components/validation-results/result-category-group.component.ts
similarity index 100%
rename from frontend/src/app/components/validation-results/result-category-group.component.ts
rename to src/frontend/src/app/components/validation-results/result-category-group.component.ts
diff --git a/frontend/src/app/components/validation-results/result-category-list.component.ts b/src/frontend/src/app/components/validation-results/result-category-list.component.ts
similarity index 100%
rename from frontend/src/app/components/validation-results/result-category-list.component.ts
rename to src/frontend/src/app/components/validation-results/result-category-list.component.ts
diff --git a/frontend/src/app/components/validation-results/result-heading-hierarchy.component.ts b/src/frontend/src/app/components/validation-results/result-heading-hierarchy.component.ts
similarity index 100%
rename from frontend/src/app/components/validation-results/result-heading-hierarchy.component.ts
rename to src/frontend/src/app/components/validation-results/result-heading-hierarchy.component.ts
diff --git a/frontend/src/app/components/validation-results/result-item.component.ts b/src/frontend/src/app/components/validation-results/result-item.component.ts
similarity index 100%
rename from frontend/src/app/components/validation-results/result-item.component.ts
rename to src/frontend/src/app/components/validation-results/result-item.component.ts
diff --git a/frontend/src/app/components/validation-results/result-stats-grid.component.ts b/src/frontend/src/app/components/validation-results/result-stats-grid.component.ts
similarity index 100%
rename from frontend/src/app/components/validation-results/result-stats-grid.component.ts
rename to src/frontend/src/app/components/validation-results/result-stats-grid.component.ts
diff --git a/frontend/src/app/components/validation-results/result-status-banner.component.ts b/src/frontend/src/app/components/validation-results/result-status-banner.component.ts
similarity index 100%
rename from frontend/src/app/components/validation-results/result-status-banner.component.ts
rename to src/frontend/src/app/components/validation-results/result-status-banner.component.ts
diff --git a/frontend/src/app/components/validation-results/validation-results.component.ts b/src/frontend/src/app/components/validation-results/validation-results.component.ts
similarity index 73%
rename from frontend/src/app/components/validation-results/validation-results.component.ts
rename to src/frontend/src/app/components/validation-results/validation-results.component.ts
index 603fa99..73b4f89 100644
--- a/frontend/src/app/components/validation-results/validation-results.component.ts
+++ b/src/frontend/src/app/components/validation-results/validation-results.component.ts
@@ -3,7 +3,6 @@ import {
   Input,
   Output,
   EventEmitter,
-  computed,
   ChangeDetectionStrategy,
 } from '@angular/core';
 import { CommonModule } from '@angular/common';
@@ -11,6 +10,7 @@ import { LucideAngularModule } from 'lucide-angular';
 import {
   ValidationResponse,
   CategoryGroup,
+  HeadingInfo,
   RuleCategory,
   RULE_METADATA,
   CATEGORY_INFO,
@@ -44,16 +44,16 @@ import { ResultHeadingHierarchyComponent } from './result-heading-hierarchy.comp
         <app-result-stats-grid
           [errors]="response.totalErrors"
           [warnings]="response.totalWarnings"
-          [categoryCount]="categoryGroups().length"
+          [categoryCount]="categoryGroups.length"
         />
       </div>
 
-      @if (categoryGroups().length > 0) {
-        <app-result-category-list [categoryGroups]="categoryGroups()" />
+      @if (categoryGroups.length > 0) {
+        <app-result-category-list [categoryGroups]="categoryGroups" />
       }
 
-      @if (response.headings.length) {
-        <app-result-heading-hierarchy [headings]="response.headings" />
+      @if (headings.length) {
+        <app-result-heading-hierarchy [headings]="headings" />
       }
 
       @if (response.isValid) {
@@ -81,14 +81,42 @@ import { ResultHeadingHierarchyComponent } from './result-heading-hierarchy.comp
   ],
 })
 export class ValidationResultsComponent {
-  @Input({ required: true }) response!: ValidationResponse;
   @Output() onDownloadAnnotated = new EventEmitter<void>();
   @Output() onReset = new EventEmitter<void>();
 
-  categoryGroups = computed(() => {
+  private _response!: ValidationResponse;
+  categoryGroups: CategoryGroup[] = [];
+  headings: HeadingInfo[] = [];
+
+  @Input({ required: true })
+  set response(value: ValidationResponse) {
+    const results = Array.isArray(value.results) ? value.results : [];
+    const headings = Array.isArray(value.headings) ? value.headings : [];
+    const totalErrors =
+      value.totalErrors ?? results.filter((result) => result.isError).length;
+    const totalWarnings =
+      value.totalWarnings ?? results.filter((result) => !result.isError).length;
+
+    this._response = {
+      ...value,
+      results,
+      headings,
+      totalErrors,
+      totalWarnings,
+      isValid: value.isValid ?? totalErrors === 0,
+    };
+    this.headings = headings;
+    this.categoryGroups = this.buildCategoryGroups(results);
+  }
+
+  get response(): ValidationResponse {
+    return this._response;
+  }
+
+  private buildCategoryGroups(results: ValidationResponse['results']): CategoryGroup[] {
     const groups: Map<RuleCategory, CategoryGroup> = new Map();
 
-    for (const result of this.response.results) {
+    for (const result of results) {
       const category =
         this.normalizeCategory(result.category) ||
         RULE_METADATA[result.ruleName]?.category ||
@@ -119,7 +147,7 @@ export class ValidationResultsComponent {
         (CATEGORY_INFO[a.category]?.order || 99) -
         (CATEGORY_INFO[b.category]?.order || 99),
     );
-  });
+  }
 
   private normalizeCategory(category: string | undefined): RuleCategory | null {
     if (!category) {
diff --git a/frontend/src/app/models/validation.models.ts b/src/frontend/src/app/models/validation.models.ts
similarity index 88%
rename from frontend/src/app/models/validation.models.ts
rename to src/frontend/src/app/models/validation.models.ts
index 341719c..60416e6 100644
--- a/frontend/src/app/models/validation.models.ts
+++ b/src/frontend/src/app/models/validation.models.ts
@@ -33,7 +33,7 @@ export interface ValidationResponse {
   totalWarnings: number;
   configUsed: string;
   results: ValidationResult[];
-  headings: HeadingInfo[];
+  headings?: HeadingInfo[];
 }
 
 export interface ValidationOptions {
@@ -95,9 +95,14 @@ export const RULE_METADATA: Record<string, { displayName: string; description: s
     description: 'Checks that headings and titles do not end with periods',
     category: 'formatting'
   },
-  'ListConsistencyRule': {
-    displayName: 'List Consistency',
-    description: 'Validates consistent punctuation and indentation in lists',
+  'ListPunctuationConsistencyRule': {
+    displayName: 'List Punctuation Consistency',
+    description: 'Checks that list item punctuation is consistent and final items end with a period',
+    category: 'layout'
+  },
+  'ListIndentationConsistencyRule': {
+    displayName: 'List Indentation Consistency',
+    description: 'Checks that list items at the same level use identical indentation',
     category: 'layout'
   },
   'ParagraphSpacingRule': {
@@ -151,12 +156,12 @@ export const RULE_METADATA: Record<string, { displayName: string; description: s
     category: 'structure'
   },
   'CheckTableOfContents': {
-    displayName: 'Table of Contents',
-    description: 'Ensures the document contains a Table of Contents',
+    displayName: 'Automatic Table of Contents',
+    description: 'Ensures the document contains an automatic Word table of contents',
     category: 'structure'
   },
-  'Manual table of contents': {
-    displayName: 'Manual table of contents',
+  'ManualTableOfContents': {
+    displayName: 'Manual Table of Contents',
     description: 'Warns when a table of contents appears to be manually written',
     category: 'structure'
   },
diff --git a/frontend/src/app/services/validation.service.ts b/src/frontend/src/app/services/validation.service.ts
similarity index 63%
rename from frontend/src/app/services/validation.service.ts
rename to src/frontend/src/app/services/validation.service.ts
index 0b5b7ab..e347dc0 100644
--- a/frontend/src/app/services/validation.service.ts
+++ b/src/frontend/src/app/services/validation.service.ts
@@ -1,8 +1,11 @@
 import { Injectable, inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 import {
+  HeadingInfo,
   ValidationOptions,
+  ValidationResult,
   ValidationResponse,
   RulesResponse,
 } from '../models/validation.models';
@@ -25,7 +28,9 @@ export class ValidationService {
     options?: ValidationOptions,
   ): Observable<ValidationResponse> {
     const formData = this.createValidationFormData(file, selectedRules, options);
-    return this.http.post<ValidationResponse>(`${this.baseUrl}/validate`, formData);
+    return this.http
+      .post<ValidationResponse>(`${this.baseUrl}/validate`, formData)
+      .pipe(map((response) => this.normalizeValidationResponse(response)));
   }
 
   validateWithComments(
@@ -55,12 +60,31 @@ export class ValidationService {
       formData.append('rules', JSON.stringify(selectedRules));
     }
 
-    formData.append(
-      'skipBeforeTableOfContents',
-      String(options?.skipBeforeTableOfContents ?? false),
-    );
-    formData.append('skipTextBoxes', String(options?.skipTextBoxes ?? true));
-
     return formData;
   }
+
+  private normalizeValidationResponse(
+    response: ValidationResponse,
+  ): ValidationResponse {
+    const results: ValidationResult[] = Array.isArray(response.results)
+      ? response.results
+      : [];
+    const headings: HeadingInfo[] = Array.isArray(response.headings)
+      ? response.headings
+      : [];
+    const totalErrors =
+      response.totalErrors ?? results.filter((result) => result.isError).length;
+    const totalWarnings =
+      response.totalWarnings ??
+      results.filter((result) => !result.isError).length;
+
+    return {
+      ...response,
+      results,
+      headings,
+      totalErrors,
+      totalWarnings,
+      isValid: response.isValid ?? totalErrors === 0,
+    };
+  }
 }
diff --git a/frontend/src/environments/environment.prod.ts b/src/frontend/src/environments/environment.prod.ts
similarity index 100%
rename from frontend/src/environments/environment.prod.ts
rename to src/frontend/src/environments/environment.prod.ts
diff --git a/frontend/src/environments/environment.ts b/src/frontend/src/environments/environment.ts
similarity index 100%
rename from frontend/src/environments/environment.ts
rename to src/frontend/src/environments/environment.ts
diff --git a/frontend/src/index.html b/src/frontend/src/index.html
similarity index 100%
rename from frontend/src/index.html
rename to src/frontend/src/index.html
diff --git a/frontend/src/main.ts b/src/frontend/src/main.ts
similarity index 100%
rename from frontend/src/main.ts
rename to src/frontend/src/main.ts
diff --git a/frontend/src/styles.css b/src/frontend/src/styles.css
similarity index 100%
rename from frontend/src/styles.css
rename to src/frontend/src/styles.css
diff --git a/frontend/tailwind.config.js b/src/frontend/tailwind.config.js
similarity index 100%
rename from frontend/tailwind.config.js
rename to src/frontend/tailwind.config.js
diff --git a/frontend/tsconfig.app.json b/src/frontend/tsconfig.app.json
similarity index 100%
rename from frontend/tsconfig.app.json
rename to src/frontend/tsconfig.app.json
diff --git a/frontend/tsconfig.json b/src/frontend/tsconfig.json
similarity index 100%
rename from frontend/tsconfig.json
rename to src/frontend/tsconfig.json
diff --git a/frontend/tsconfig.spec.json b/src/frontend/tsconfig.spec.json
similarity index 100%
rename from frontend/tsconfig.spec.json
rename to src/frontend/tsconfig.spec.json
diff --git a/tests/backend.Tests/Application/Validation/ValidationDependencyInjectionTests.cs b/tests/backend.Tests/Application/Validation/ValidationDependencyInjectionTests.cs
new file mode 100644
index 0000000..6f274e8
--- /dev/null
+++ b/tests/backend.Tests/Application/Validation/ValidationDependencyInjectionTests.cs
@@ -0,0 +1,81 @@
+using ThesisValidationOrchestrator = backend.Application.Validation.ThesisValidator;
+using backend.Annotation;
+using backend.Application.Validation;
+using backend.DocumentProcessing.Content;
+using backend.DocumentProcessing.Context;
+using backend.DocumentProcessing.Documents;
+using backend.DocumentProcessing.Figures;
+using backend.DocumentProcessing.Formatting;
+using backend.DocumentProcessing.Lists;
+using backend.DocumentProcessing.Paragraphs;
+using backend.Infrastructure.LanguageTool;
+using backend.Rules;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using ThesisValidator.Rules;
+
+namespace backend.Tests.Application.Validation;
+
+public sealed class ValidationDependencyInjectionTests
+{
+    [Fact]
+    public void ServiceProvider_CanResolveValidatorAndValidationRules()
+    {
+        var services = new ServiceCollection();
+        var configuration = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?>
+            {
+                ["LanguageTool:BaseUrl"] = "http://localhost:8010",
+                ["Validation:Skipping:SkipTextBoxes"] = "true",
+                ["Validation:Skipping:SkipTableOfContentsContent"] = "true"
+            })
+            .Build();
+
+        services.AddSingleton<IConfiguration>(configuration);
+        services.AddHttpClient<LanguageToolClient>();
+        services.AddOptions<ValidationSkippingOptions>()
+            .Bind(configuration.GetSection(ValidationSkippingOptions.SectionName));
+
+        services.AddSingleton<ValidationIssueComposer>();
+        services.AddSingleton<RulePolicyResolver>();
+        services.AddSingleton<RuleOptionsBinder>();
+        services.AddSingleton<DocumentSession>();
+        services.AddSingleton<DocumentSkipResolver>();
+        services.AddSingleton<DocumentContentAnalyzer>();
+        services.AddSingleton<FormattingResolver>();
+        services.AddSingleton<ParagraphClassifier>();
+        services.AddSingleton<ListAnalyzer>();
+        services.AddSingleton<FigureCaptionAnalyzer>();
+        services.AddScoped<RuleRunner>();
+        services.AddSingleton<SectionContextResolver>();
+        services.AddSingleton<AnnotationApplicator>();
+
+        var validationRuleTypes = typeof(FontFamilyRule).Assembly.GetTypes()
+            .Where(t => typeof(IValidationRule).IsAssignableFrom(t)
+                && !t.IsInterface
+                && !t.IsAbstract
+                && !t.IsNested);
+
+        foreach (var ruleType in validationRuleTypes)
+        {
+            services.AddScoped(typeof(IValidationRule), ruleType);
+        }
+
+        services.AddScoped<ThesisValidationOrchestrator>();
+
+        using var provider = services.BuildServiceProvider(new ServiceProviderOptions
+        {
+            ValidateOnBuild = true,
+            ValidateScopes = true
+        });
+        using var scope = provider.CreateScope();
+
+        var validator = scope.ServiceProvider.GetRequiredService<ThesisValidationOrchestrator>();
+        var ruleIds = validator.GetAvailableRules()
+            .Select(rule => rule.Id)
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        Assert.Contains(FontFamilyRule.RuleId, ruleIds);
+        Assert.Contains(GrammarRule.RuleId, ruleIds);
+    }
+}
diff --git a/tests/backend.Tests/DocumentProcessing/.gitkeep b/tests/backend.Tests/DocumentProcessing/.gitkeep
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/tests/backend.Tests/DocumentProcessing/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/backend.Tests/Endpoints/DocumentEndpointTests.cs b/tests/backend.Tests/Endpoints/DocumentEndpointTests.cs
similarity index 50%
rename from backend.Tests/Endpoints/DocumentEndpointTests.cs
rename to tests/backend.Tests/Endpoints/DocumentEndpointTests.cs
index 3b5729b..bacc0ec 100644
--- a/backend.Tests/Endpoints/DocumentEndpointTests.cs
+++ b/tests/backend.Tests/Endpoints/DocumentEndpointTests.cs
@@ -1,15 +1,18 @@
+using ThesisValidationOrchestrator = backend.Application.Validation.ThesisValidator;
+using backend.DocumentProcessing.Documents;
+using backend.DocumentProcessing.Context;
+using backend.DocumentProcessing.Content;
+using backend.Application.Validation;
+using backend.Annotation;
+using backend.Endpoints.Documents;
+using backend.Endpoints.Documents.Responses;
 using System.Reflection;
-using backend.Models;
-using backend.Endpoints;
-using Backend.Models;
-using DocumentFormat.OpenXml.Packaging;
+using Microsoft.Extensions.Configuration;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using ThesisValidator.Rules;
-using backend.Services.Analysis;
-using backend.Services.Comments;
 
 namespace backend.Tests.Endpoints;
 
@@ -88,6 +91,56 @@ public void ValidateEndpoints_WithUnreadableDocx_ReturnGenericBadRequest(string
             problem.Detail);
     }
 
+    [Fact]
+    public void CreateValidationResponse_MapsValidationIssuesToResponseDtos()
+    {
+        var endpointResultsType = typeof(DocumentEndpoint).Assembly.GetType(
+            "backend.Endpoints.Documents.DocumentEndpointResults");
+
+        Assert.NotNull(endpointResultsType);
+
+        var method = endpointResultsType.GetMethod(
+            "CreateValidationResponse",
+            BindingFlags.Public | BindingFlags.Static);
+
+        Assert.NotNull(method);
+
+        using var stream = new MemoryStream(new byte[12]);
+        var request = CreateUploadRequest(new FormFile(stream, 0, stream.Length, "file", "thesis.docx"));
+        var issues = new List<ValidationIssue>
+        {
+            new()
+            {
+                RuleName = "FontFamily",
+                Message = "Wrong font",
+                Category = RuleCategories.Formatting,
+                Severity = RuleSeverity.Error,
+                Location = new DocumentLocation
+                {
+                    Paragraph = 2,
+                    Run = 1,
+                    CharacterOffset = 4,
+                    Length = 5,
+                    Text = "Arial",
+                    Section = "Introduction"
+                }
+            }
+        };
+
+        var response = Assert.IsType<DocumentValidationResponse>(
+            method.Invoke(null, [request, issues]));
+        var issue = Assert.Single(response.Results);
+
+        Assert.Equal("thesis.docx", response.FileName);
+        Assert.False(response.IsValid);
+        Assert.Equal(1, response.TotalErrors);
+        Assert.Equal(0, response.TotalWarnings);
+        Assert.Equal("FontFamily", issue.RuleName);
+        Assert.True(issue.IsError);
+        Assert.Equal(RuleSeverity.Error.ToString(), issue.Severity);
+        Assert.Equal("Introduction", issue.Location.Section);
+    }
+
     private static IResult InvokeEndpoint(string methodName, string? rules, params IValidationRule[] availableRules)
     {
         var method = typeof(DocumentEndpoint).GetMethod(
@@ -102,10 +155,7 @@ private static IResult InvokeEndpoint(string methodName, string? rules, params I
             {
                 CreateDocxFile(),
                 rules,
-                null,
-                null,
-                new ThesisValidatorService(availableRules),
-                Options.Create(new UniversityConfig()),
+                CreateValidator(availableRules),
                 NullLoggerFactory.Instance
             });
 
@@ -118,6 +168,20 @@ private static IFormFile CreateDocxFile()
         return new FormFile(stream, 0, stream.Length, "file", "thesis.docx");
     }
 
+    private static object CreateUploadRequest(IFormFile file)
+    {
+        var requestType = typeof(DocumentEndpoint).Assembly.GetType(
+            "backend.Endpoints.Documents.DocumentUploadRequest");
+
+        Assert.NotNull(requestType);
+
+        return Activator.CreateInstance(
+            requestType,
+            file,
+            "thesis.docx",
+            new List<string> { "FontFamily" })!;
+    }
+
     private static ProblemDetails AssertBadRequest(IResult result)
     {
         var resultType = result.GetType();
@@ -128,21 +192,46 @@ private static ProblemDetails AssertBadRequest(IResult result)
         return Assert.IsType<ProblemDetails>(value);
     }
 
-    private sealed class TestValidationRule : IValidationRule
+    private static ThesisValidationOrchestrator CreateValidator(params IValidationRule[] rules)
     {
+        var configuration = new ConfigurationBuilder().Build();
+        var policyResolver = new RulePolicyResolver(configuration);
+        var optionsBinder = new RuleOptionsBinder(configuration);
+        var resultComposer = new ValidationIssueComposer();
+
+        return new ThesisValidationOrchestrator(
+            new DocumentSession(),
+            new DocumentContentAnalyzer(new DocumentSkipResolver(
+                Options.Create(new ValidationSkippingOptions()))),
+            new RuleRunner(rules, policyResolver, optionsBinder, resultComposer),
+            new SectionContextResolver(),
+            new AnnotationApplicator());
+    }
+
+    private sealed class TestValidationRule : ValidationRule<TestValidationRuleOptions>
+    {
+        private readonly string _name;
+
         public TestValidationRule(string name)
         {
-            Name = name;
+            _name = name;
         }
 
-        public string Name { get; }
-
-        public IEnumerable<ValidationResult> Validate(
-            WordprocessingDocument doc,
-            UniversityConfig config,
-            DocumentCommentService? documentCommentService = null)
+        public override RuleDescriptor Descriptor => new(
+            Name: _name,
+            DisplayName: _name,
+            Description: _name,
+            Category: RuleCategories.Formatting,
+            DefaultAvailability: RuleAvailability.Available,
+            DefaultSeverity: RuleSeverity.Error);
+
+        public override IEnumerable<RuleProblem> Validate(
+            RuleContext context,
+            TestValidationRuleOptions options)
         {
-            return Array.Empty<ValidationResult>();
+            return [];
         }
     }
+
+    private sealed class TestValidationRuleOptions : RuleOptionsBase;
 }
diff --git a/backend.Tests/Helpers/DocxTestHelper.cs b/tests/backend.Tests/Helpers/DocxTestHelper.cs
similarity index 100%
rename from backend.Tests/Helpers/DocxTestHelper.cs
rename to tests/backend.Tests/Helpers/DocxTestHelper.cs
diff --git a/tests/backend.Tests/Rules/EmptySectionStructureRuleConfigurationTests.cs b/tests/backend.Tests/Rules/EmptySectionStructureRuleConfigurationTests.cs
new file mode 100644
index 0000000..4c59d26
--- /dev/null
+++ b/tests/backend.Tests/Rules/EmptySectionStructureRuleConfigurationTests.cs
@@ -0,0 +1,143 @@
+using ThesisValidationOrchestrator = backend.Application.Validation.ThesisValidator;
+using backend.DocumentProcessing.Documents;
+using backend.DocumentProcessing.Context;
+using backend.DocumentProcessing.Content;
+using backend.Application.Validation;
+using backend.Annotation;
+using backend.Rules;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+using ThesisValidator.Rules;
+
+namespace backend.Tests.Rules;
+
+public class EmptySectionStructureRuleConfigurationTests
+{
+    [Fact]
+    public void GetAvailableRules_WhenEmptySectionRuleIsAvailable_IncludesRule()
+    {
+        var service = CreateService();
+
+        var rules = service.GetAvailableRules();
+
+        Assert.Contains(rules, rule => rule.Id == EmptySectionStructureRule.RuleId);
+    }
+
+    [Fact]
+    public void GetAvailableRules_WhenEmptySectionRuleIsHidden_ExcludesRule()
+    {
+        var service = CreateService(new Dictionary<string, string?>
+        {
+            ["Validation:Rules:EmptySectionStructureRule:Availability"] = "Hidden"
+        });
+
+        var rules = service.GetAvailableRules();
+
+        Assert.DoesNotContain(rules, rule => rule.Id == EmptySectionStructureRule.RuleId);
+    }
+
+    [Fact]
+    public void Validate_WhenHiddenRuleIsManuallySelected_DoesNotExecuteRule()
+    {
+        var service = CreateService(new Dictionary<string, string?>
+        {
+            ["Validation:Rules:EmptySectionStructureRule:Availability"] = "Hidden"
+        });
+        using var stream = CreateEmptySectionDocxStream();
+
+        var results = service.Validate(stream, [EmptySectionStructureRule.RuleId]);
+
+        Assert.Empty(results);
+    }
+
+    [Fact]
+    public void Validate_WhenSeverityIsWarning_AppliesWarning()
+    {
+        var result = ValidateEmptySectionRule(new Dictionary<string, string?>
+        {
+            ["Validation:Rules:EmptySectionStructureRule:Severity"] = "Warning"
+        });
+
+        Assert.Equal(RuleSeverity.Warning, result.Severity);
+        Assert.False(result.IsError);
+    }
+
+    [Fact]
+    public void Validate_WhenSeverityIsError_AppliesError()
+    {
+        var result = ValidateEmptySectionRule(new Dictionary<string, string?>
+        {
+            ["Validation:Rules:EmptySectionStructureRule:Severity"] = "Error"
+        });
+
+        Assert.Equal(RuleSeverity.Error, result.Severity);
+        Assert.True(result.IsError);
+    }
+
+    [Fact]
+    public void Validate_StillPopulatesSectionContext()
+    {
+        var result = ValidateEmptySectionRule();
+
+        Assert.Equal("Chapter 1", result.Location.Section);
+    }
+
+    private static ValidationIssue ValidateEmptySectionRule(
+        Dictionary<string, string?>? configurationValues = null)
+    {
+        var service = CreateService(configurationValues);
+        using var stream = CreateEmptySectionDocxStream();
+
+        return Assert.Single(service.Validate(stream, [EmptySectionStructureRule.RuleId]));
+    }
+
+    private static ThesisValidationOrchestrator CreateService(
+        Dictionary<string, string?>? configurationValues = null)
+    {
+        var configuration = new ConfigurationBuilder()
+            .AddInMemoryCollection(configurationValues ?? new Dictionary<string, string?>())
+            .Build();
+        var policyResolver = new RulePolicyResolver(configuration);
+        var optionsBinder = new RuleOptionsBinder(configuration);
+        var resultComposer = new ValidationIssueComposer();
+
+        return new ThesisValidationOrchestrator(
+            new DocumentSession(),
+            new DocumentContentAnalyzer(new DocumentSkipResolver(
+                Options.Create(new ValidationSkippingOptions()))),
+            new RuleRunner(
+                [new EmptySectionStructureRule()],
+                policyResolver,
+                optionsBinder,
+                resultComposer),
+            new SectionContextResolver(),
+            new AnnotationApplicator());
+    }
+
+    private static MemoryStream CreateEmptySectionDocxStream()
+    {
+        var stream = new MemoryStream();
+        using (var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document))
+        {
+            var mainPart = doc.AddMainDocumentPart();
+            mainPart.Document = new Document(
+                new Body(
+                    CreateHeading("Chapter 1", "Heading1"),
+                    CreateHeading("Section 1.1", "Heading2")));
+            mainPart.Document.Save();
+        }
+
+        stream.Position = 0;
+        return stream;
+    }
+
+    private static Paragraph CreateHeading(string text, string styleId)
+    {
+        return new Paragraph(
+            new ParagraphProperties(new ParagraphStyleId { Val = styleId }),
+            new Run(new Text(text)));
+    }
+}
diff --git a/tests/backend.Tests/Rules/FontFamilyRuleConfigurationTests.cs b/tests/backend.Tests/Rules/FontFamilyRuleConfigurationTests.cs
new file mode 100644
index 0000000..ce2285c
--- /dev/null
+++ b/tests/backend.Tests/Rules/FontFamilyRuleConfigurationTests.cs
@@ -0,0 +1,218 @@
+using ThesisValidationOrchestrator = backend.Application.Validation.ThesisValidator;
+using backend.DocumentProcessing.Documents;
+using backend.DocumentProcessing.Context;
+using backend.DocumentProcessing.Content;
+using backend.Application.Validation;
+using backend.Annotation;
+using backend.Rules;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+using ThesisValidator.Rules;
+
+namespace backend.Tests.Rules;
+
+public class FontFamilyRuleConfigurationTests
+{
+    [Fact]
+    public void GetAvailableRules_WhenFontFamilyRuleIsAvailable_IncludesRule()
+    {
+        var service = CreateService();
+
+        var rules = service.GetAvailableRules();
+
+        Assert.Contains(rules, rule => rule.Id == FontFamilyRule.RuleId);
+    }
+
+    [Fact]
+    public void GetAvailableRules_WhenFontFamilyRuleIsHidden_ExcludesRule()
+    {
+        var service = CreateService(new Dictionary<string, string?>
+        {
+            [$"Validation:Rules:{FontFamilyRule.RuleId}:Availability"] = "Hidden"
+        });
+
+        var rules = service.GetAvailableRules();
+
+        Assert.DoesNotContain(rules, rule => rule.Id == FontFamilyRule.RuleId);
+    }
+
+    [Fact]
+    public void GetAvailableRules_WhenSeverityIsWarning_ReportsWarning()
+    {
+        var service = CreateService(new Dictionary<string, string?>
+        {
+            [$"Validation:Rules:{FontFamilyRule.RuleId}:Severity"] = "Warning"
+        });
+
+        var rule = Assert.Single(
+            service.GetAvailableRules(),
+            rule => rule.Id == FontFamilyRule.RuleId);
+
+        Assert.Equal(RuleSeverity.Warning.ToString(), rule.DefaultSeverity);
+    }
+
+    [Fact]
+    public void Validate_WhenHiddenRuleIsManuallySelected_DoesNotExecuteRule()
+    {
+        var service = CreateService(new Dictionary<string, string?>
+        {
+            [$"Validation:Rules:{FontFamilyRule.RuleId}:Availability"] = "Hidden"
+        });
+        using var stream = CreateDocxStream(("Wrong font paragraph", "Arial"));
+
+        var results = service.Validate(stream, [FontFamilyRule.RuleId]);
+
+        Assert.Empty(results);
+    }
+
+    [Fact]
+    public void Validate_WhenSeverityIsWarning_AppliesWarning()
+    {
+        var result = ValidateFontFamilyRule(new Dictionary<string, string?>
+        {
+            [$"Validation:Rules:{FontFamilyRule.RuleId}:Severity"] = "Warning"
+        });
+
+        Assert.Equal(RuleSeverity.Warning, result.Severity);
+        Assert.False(result.IsError);
+    }
+
+    [Fact]
+    public void Validate_WhenSeverityIsError_AppliesError()
+    {
+        var result = ValidateFontFamilyRule(new Dictionary<string, string?>
+        {
+            [$"Validation:Rules:{FontFamilyRule.RuleId}:Severity"] = "Error"
+        });
+
+        Assert.Equal(RuleSeverity.Error, result.Severity);
+        Assert.True(result.IsError);
+    }
+
+    [Fact]
+    public void Validate_WhenRequiredFontFamilyIsConfigured_UsesConfiguredFont()
+    {
+        var service = CreateService(new Dictionary<string, string?>
+        {
+            [$"Validation:Rules:{FontFamilyRule.RuleId}:RequiredFontFamily"] = "Arial"
+        });
+        using var stream = CreateDocxStream(("Configured font paragraph", "Arial"));
+
+        var results = service.Validate(stream, [FontFamilyRule.RuleId]);
+
+        Assert.Empty(results);
+    }
+
+    [Fact]
+    public void Validate_WithSelectedRules_RunsFontFamilyWithoutRunningUnselectedRule()
+    {
+        var selectedRule = new RecordingRule(FontFamilyRule.RuleId);
+        var unselectedRule = new RecordingRule("Grammar");
+        var service = CreateService(
+            configurationValues: null,
+            rules: [selectedRule, unselectedRule]);
+        using var stream = CreateDocxStream(("Body text", "Times New Roman"));
+
+        service.Validate(stream, [FontFamilyRule.RuleId]);
+
+        Assert.Equal(1, selectedRule.RunCount);
+        Assert.Equal(0, unselectedRule.RunCount);
+    }
+
+    private static ValidationIssue ValidateFontFamilyRule(
+        Dictionary<string, string?>? configurationValues = null)
+    {
+        var service = CreateService(configurationValues);
+        using var stream = CreateDocxStream(("Wrong font paragraph", "Arial"));
+
+        return Assert.Single(service.Validate(stream, [FontFamilyRule.RuleId]));
+    }
+
+    private static ThesisValidationOrchestrator CreateService(
+        Dictionary<string, string?>? configurationValues = null,
+        IEnumerable<IValidationRule>? rules = null)
+    {
+        var configuration = new ConfigurationBuilder()
+            .AddInMemoryCollection(configurationValues ?? new Dictionary<string, string?>())
+            .Build();
+        var policyResolver = new RulePolicyResolver(configuration);
+        var optionsBinder = new RuleOptionsBinder(configuration);
+        var resultComposer = new ValidationIssueComposer();
+
+        return new ThesisValidationOrchestrator(
+            new DocumentSession(),
+            new DocumentContentAnalyzer(new DocumentSkipResolver(
+                Options.Create(new ValidationSkippingOptions()))),
+            new RuleRunner(
+                rules ?? [new FontFamilyRule()],
+                policyResolver,
+                optionsBinder,
+                resultComposer),
+            new SectionContextResolver(),
+            new AnnotationApplicator());
+    }
+
+    private static MemoryStream CreateDocxStream(params (string Text, string? FontFamily)[] paragraphs)
+    {
+        var stream = new MemoryStream();
+        using (var doc = WordprocessingDocument.Create(stream, WordprocessingDocumentType.Document))
+        {
+            var mainPart = doc.AddMainDocumentPart();
+            mainPart.Document = new Document(new Body());
+
+            foreach (var (text, fontFamily) in paragraphs)
+            {
+                var run = new Run(new Text(text));
+                if (!string.IsNullOrWhiteSpace(fontFamily))
+                {
+                    run.RunProperties = new RunProperties(
+                        new RunFonts { Ascii = fontFamily, HighAnsi = fontFamily });
+                }
+
+                mainPart.Document.Body!.Append(new Paragraph(run));
+            }
+
+            mainPart.Document.Save();
+        }
+
+        stream.Position = 0;
+        return stream;
+    }
+
+    private sealed class RecordingRule : ValidationRule<RecordingRuleOptions>
+    {
+        private readonly string _name;
+
+        public RecordingRule(string name)
+        {
+            _name = name;
+        }
+
+        public int RunCount { get; private set; }
+
+        public override RuleDescriptor Descriptor => new(
+            Name: _name,
+            DisplayName: _name,
+            Description: _name,
+            Category: RuleCategories.Formatting,
+            DefaultAvailability: RuleAvailability.Available,
+            DefaultSeverity: RuleSeverity.Error);
+
+        public override IEnumerable<RuleProblem> Validate(
+            RuleContext context,
+            RecordingRuleOptions options)
+        {
+            RunCount++;
+
+            yield return new RuleProblem(
+                "Executed",
+                new DocumentLocation(),
+                ParagraphIndexKind.BodyElement);
+        }
+    }
+
+    private sealed class RecordingRuleOptions : RuleOptionsBase;
+}
diff --git a/tests/backend.Tests/Rules/FontFamilyRuleTests.cs b/tests/backend.Tests/Rules/FontFamilyRuleTests.cs
new file mode 100644
index 0000000..ba2b302
--- /dev/null
+++ b/tests/backend.Tests/Rules/FontFamilyRuleTests.cs
@@ -0,0 +1,148 @@
+using backend.DocumentProcessing.Context;
+using backend.DocumentProcessing.Content;
+using backend.Rules;
+using backend.Tests.Helpers;
+using Microsoft.Extensions.Options;
+using ThesisValidator.Rules;
+
+namespace backend.Tests.Rules;
+
+public class FontFamilyRuleTests
+{
+    private readonly FontFamilyRule _rule = new();
+
+    [Fact]
+    public void Validate_AllParagraphsWithCorrectFont_ReturnsNoProblems()
+    {
+        using var docx = DocxTestHelper.CreateInMemoryDocx(
+            ("First paragraph", "Times New Roman"),
+            ("Second paragraph", "Times New Roman"));
+
+        var problems = Validate(docx, new FontFamilyRuleOptions()).ToList();
+
+        Assert.Empty(problems);
+    }
+
+    [Fact]
+    public void Validate_ParagraphWithWrongFont_ReturnsProblem()
+    {
+        using var docx = DocxTestHelper.CreateInMemoryDocx(
+            ("Correct font paragraph", "Times New Roman"),
+            ("Wrong font paragraph", "Arial"));
+
+        var problems = Validate(docx, new FontFamilyRuleOptions()).ToList();
+
+        var problem = Assert.Single(problems);
+        Assert.Contains("Arial", problem.Message);
+        Assert.Contains("Times New Roman", problem.Message);
+    }
+
+    [Fact]
+    public void Validate_MultipleParagraphsWithWrongFonts_ReturnsMultipleProblems()
+    {
+        using var docx = DocxTestHelper.CreateInMemoryDocx(
+            ("Arial paragraph", "Arial"),
+            ("Calibri paragraph", "Calibri"),
+            ("Correct paragraph", "Times New Roman"));
+
+        var problems = Validate(docx, new FontFamilyRuleOptions()).ToList();
+
+        Assert.Equal(2, problems.Count);
+        Assert.Contains(problems, problem => problem.Message.Contains("Arial"));
+        Assert.Contains(problems, problem => problem.Message.Contains("Calibri"));
+    }
+
+    [Fact]
+    public void Validate_WithDefaultFontStyle_UsesDefaultFont()
+    {
+        using var docx = DocxTestHelper.CreateInMemoryDocxWithDefaultFont(
+            "Times New Roman",
+            "Paragraph without explicit font");
+
+        var problems = Validate(docx, new FontFamilyRuleOptions()).ToList();
+
+        Assert.Empty(problems);
+    }
+
+    [Fact]
+    public void Validate_WithConfiguredRequiredFont_UsesConfiguredFont()
+    {
+        using var docx = DocxTestHelper.CreateInMemoryDocx(
+            ("Arial paragraph", "Arial"));
+
+        var problems = Validate(docx, new FontFamilyRuleOptions
+        {
+            RequiredFontFamily = "Arial"
+        }).ToList();
+
+        Assert.Empty(problems);
+    }
+
+    [Fact]
+    public void Validate_EmptyParagraph_IsSkipped()
+    {
+        using var docx = DocxTestHelper.CreateInMemoryDocx(
+            ("", "Arial"),
+            ("   ", "Calibri"),
+            ("Valid text", "Times New Roman"));
+
+        var problems = Validate(docx, new FontFamilyRuleOptions()).ToList();
+
+        Assert.Empty(problems);
+    }
+
+    [Fact]
+    public void Validate_ProblemContainsCorrectLocation()
+    {
+        using var docx = DocxTestHelper.CreateInMemoryDocx(
+            ("First paragraph", "Times New Roman"),
+            ("Second paragraph with wrong font", "Arial"));
+
+        var problems = Validate(docx, new FontFamilyRuleOptions()).ToList();
+
+        var problem = Assert.Single(problems);
+        Assert.Equal(2, problem.Location.Paragraph);
+        Assert.Equal(1, problem.Location.Run);
+        Assert.Equal(0, problem.Location.CharacterOffset);
+        Assert.Equal("Second paragraph with wrong font".Length, problem.Location.Length);
+        Assert.Equal("Second paragraph with wrong font", problem.Location.Text);
+        Assert.Equal(ParagraphIndexKind.BodyElement, problem.ParagraphIndexKind);
+        Assert.IsType<RunAnnotationTarget>(problem.AnnotationTarget);
+    }
+
+    [Fact]
+    public void Validate_LocationTracksCharacterOffset()
+    {
+        using var docx = DocxTestHelper.CreateInMemoryDocxWithMultipleRuns(
+            ("First run ", "Times New Roman"),
+            ("Second run with wrong font", "Arial"));
+
+        var problems = Validate(docx, new FontFamilyRuleOptions()).ToList();
+
+        var problem = Assert.Single(problems);
+        Assert.Equal(1, problem.Location.Paragraph);
+        Assert.Equal(2, problem.Location.Run);
+        Assert.Equal("First run ".Length, problem.Location.CharacterOffset);
+    }
+
+    [Fact]
+    public void Validate_RuleDescriptorUsesFontFamilyRuleId()
+    {
+        Assert.Equal(FontFamilyRule.RuleId, _rule.Descriptor.Name);
+    }
+
+    private IEnumerable<RuleProblem> Validate(
+        InMemoryDocx docx,
+        FontFamilyRuleOptions options)
+    {
+        var analyzer = new DocumentContentAnalyzer(new DocumentSkipResolver(
+            Options.Create(new ValidationSkippingOptions())));
+        var context = new RuleContext
+        {
+            RawDocument = docx.Document,
+            Content = analyzer.Analyze(docx.Document)
+        };
+
+        return _rule.Validate(context, options);
+    }
+}
diff --git a/backend.Tests/backend.Tests.csproj b/tests/backend.Tests/ThesisValidator.Api.Tests.csproj
similarity index 64%
rename from backend.Tests/backend.Tests.csproj
rename to tests/backend.Tests/ThesisValidator.Api.Tests.csproj
index 9c6402d..ff77a27 100644
--- a/backend.Tests/backend.Tests.csproj
+++ b/tests/backend.Tests/ThesisValidator.Api.Tests.csproj
@@ -25,21 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\backend\backend.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="Fixtures\Fonts\fonts.docx" />
-    <Content Include="Fixtures\Fonts\fonts.docx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="Fixtures\test.docx" />
-    <Content Include="Fixtures\test.docx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <ProjectReference Include="..\..\src\backend\ThesisValidator.Api.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/thesis-validator.sln.DotSettings.user b/thesis-validator.sln.DotSettings.user
deleted file mode 100644
index 55d122a..0000000
--- a/thesis-validator.sln.DotSettings.user
+++ /dev/null
@@ -1,7 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=43164734_002Df486_002D413f_002D838b_002D9c7218df2232/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="Explore_Fonts" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
-  &lt;TestAncestor&gt;&#xD;
-    &lt;TestId&gt;xUnit::871FB478-6040-4FAA-A744-1F98C040DB41::net9.0::backend.Tests.Exploratory.FontExplorationTests.Explore_Fonts&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;xUnit::871FB478-6040-4FAA-A744-1F98C040DB41::net9.0::backend.Tests.Exploratory.FontExplorationTests.Print_text_with_font_info&lt;/TestId&gt;&#xD;
-  &lt;/TestAncestor&gt;&#xD;
-&lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>
\ No newline at end of file