diff --git a/Nocr.TextMatcher.sln b/Nocr.TextMatcher.sln
index fc55740..ae093f3 100644
--- a/Nocr.TextMatcher.sln
+++ b/Nocr.TextMatcher.sln
@@ -18,8 +18,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nocr.TextMatcher.Async.Api.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nocr.TextMatcher.Api.Contracts", "src\Nocr.TextMatcher.Api.Contracts\Nocr.TextMatcher.Api.Contracts.csproj", "{A6332064-40EE-498A-826D-638BC295A185}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nocr.TextMatcher.AppServices.Contracts", "src\Nocr.TextMatcher.AppServices.Contracts\Nocr.TextMatcher.AppServices.Contracts.csproj", "{01BF99EE-D635-4931-9CAB-B51C54F0760B}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Tests", "_Tests", "{6E4D9F75-861F-4C00-A5C8-00D1BEE5A659}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nocr.TextMatcher.AppServices.UnitTests", "tests\Nocr.TextMatcher.AppServices.UnitTests\Nocr.TextMatcher.AppServices.UnitTests.csproj", "{B721E055-84AF-44C6-973D-33241FD2EA7C}"
@@ -50,10 +48,6 @@ Global
{A6332064-40EE-498A-826D-638BC295A185}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6332064-40EE-498A-826D-638BC295A185}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6332064-40EE-498A-826D-638BC295A185}.Release|Any CPU.Build.0 = Release|Any CPU
- {01BF99EE-D635-4931-9CAB-B51C54F0760B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {01BF99EE-D635-4931-9CAB-B51C54F0760B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {01BF99EE-D635-4931-9CAB-B51C54F0760B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {01BF99EE-D635-4931-9CAB-B51C54F0760B}.Release|Any CPU.Build.0 = Release|Any CPU
{B721E055-84AF-44C6-973D-33241FD2EA7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B721E055-84AF-44C6-973D-33241FD2EA7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B721E055-84AF-44C6-973D-33241FD2EA7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/src/Nocr.TextMatcher.Api.Contracts/Nocr.TextMatcher.Api.Contracts.csproj b/src/Nocr.TextMatcher.Api.Contracts/Nocr.TextMatcher.Api.Contracts.csproj
index 457f710..27549fd 100644
--- a/src/Nocr.TextMatcher.Api.Contracts/Nocr.TextMatcher.Api.Contracts.csproj
+++ b/src/Nocr.TextMatcher.Api.Contracts/Nocr.TextMatcher.Api.Contracts.csproj
@@ -4,10 +4,6 @@
true
-
-
-
-
diff --git a/src/Nocr.TextMatcher.Api.Contracts/TextMatches/Dto/TextMatchData.cs b/src/Nocr.TextMatcher.Api.Contracts/TextMatches/Dto/TextMatchData.cs
index 903c318..b6ca302 100644
--- a/src/Nocr.TextMatcher.Api.Contracts/TextMatches/Dto/TextMatchData.cs
+++ b/src/Nocr.TextMatcher.Api.Contracts/TextMatches/Dto/TextMatchData.cs
@@ -1,5 +1,3 @@
-using Nocr.TextMatcher.AppServices.Contracts.TextMatches;
-
namespace Nocr.TextMatcher.Api.Contracts.TextMatches.Dto;
public sealed class TextMatchData
diff --git a/src/Nocr.TextMatcher.Api.Contracts/TextMatches/ITextMatchesController.cs b/src/Nocr.TextMatcher.Api.Contracts/TextMatches/ITextMatchesController.cs
index e973e83..4ad4e22 100644
--- a/src/Nocr.TextMatcher.Api.Contracts/TextMatches/ITextMatchesController.cs
+++ b/src/Nocr.TextMatcher.Api.Contracts/TextMatches/ITextMatchesController.cs
@@ -1,4 +1,5 @@
using Nocr.TextMatcher.Api.Contracts.TextMatches.Dto;
+using Nocr.TextMatcher.Api.Contracts.TextMatches.Requests;
using RestEase;
namespace Nocr.TextMatcher.Api.Contracts.TextMatches;
diff --git a/src/Nocr.TextMatcher.Api.Contracts/TextMatches/Requests/CreateTextMatchRequest.cs b/src/Nocr.TextMatcher.Api.Contracts/TextMatches/Requests/CreateTextMatchRequest.cs
index ae08618..3ea7758 100644
--- a/src/Nocr.TextMatcher.Api.Contracts/TextMatches/Requests/CreateTextMatchRequest.cs
+++ b/src/Nocr.TextMatcher.Api.Contracts/TextMatches/Requests/CreateTextMatchRequest.cs
@@ -1,6 +1,4 @@
-using Nocr.TextMatcher.AppServices.Contracts.TextMatches;
-
-namespace Nocr.TextMatcher.Api.Contracts.TextMatches.Dto;
+namespace Nocr.TextMatcher.Api.Contracts.TextMatches.Requests;
public class CreateTextMatchRequest
{
diff --git a/src/Nocr.TextMatcher.AppServices.Contracts/TextMatches/TextMatchRule.cs b/src/Nocr.TextMatcher.Api.Contracts/TextMatches/TextMatchRule.cs
similarity index 73%
rename from src/Nocr.TextMatcher.AppServices.Contracts/TextMatches/TextMatchRule.cs
rename to src/Nocr.TextMatcher.Api.Contracts/TextMatches/TextMatchRule.cs
index 98f118e..28666c7 100644
--- a/src/Nocr.TextMatcher.AppServices.Contracts/TextMatches/TextMatchRule.cs
+++ b/src/Nocr.TextMatcher.Api.Contracts/TextMatches/TextMatchRule.cs
@@ -1,4 +1,4 @@
-namespace Nocr.TextMatcher.AppServices.Contracts.TextMatches;
+namespace Nocr.TextMatcher.Api.Contracts.TextMatches;
public enum TextMatchRule
{
diff --git a/src/Nocr.TextMatcher.AppServices.Contracts/Nocr.TextMatcher.AppServices.Contracts.csproj b/src/Nocr.TextMatcher.AppServices.Contracts/Nocr.TextMatcher.AppServices.Contracts.csproj
deleted file mode 100644
index f92262b..0000000
--- a/src/Nocr.TextMatcher.AppServices.Contracts/Nocr.TextMatcher.AppServices.Contracts.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- false
-
-
-
diff --git a/src/Nocr.TextMatcher.AppServices/Nocr.TextMatcher.AppServices.csproj b/src/Nocr.TextMatcher.AppServices/Nocr.TextMatcher.AppServices.csproj
index e38b9e1..90cdda5 100644
--- a/src/Nocr.TextMatcher.AppServices/Nocr.TextMatcher.AppServices.csproj
+++ b/src/Nocr.TextMatcher.AppServices/Nocr.TextMatcher.AppServices.csproj
@@ -13,7 +13,6 @@
-
diff --git a/src/Nocr.TextMatcher.AppServices/TextMatches/Repositories/InMemoryTextMatchRepository.cs b/src/Nocr.TextMatcher.AppServices/TextMatches/Repositories/InMemoryTextMatchRepository.cs
index da9be80..a87a9fc 100644
--- a/src/Nocr.TextMatcher.AppServices/TextMatches/Repositories/InMemoryTextMatchRepository.cs
+++ b/src/Nocr.TextMatcher.AppServices/TextMatches/Repositories/InMemoryTextMatchRepository.cs
@@ -1,5 +1,5 @@
+using Nocr.TextMatcher.Api.Contracts.TextMatches;
using Nocr.TextMatcher.Api.Contracts.TextMatches.Dto;
-using Nocr.TextMatcher.AppServices.Contracts.TextMatches;
namespace Nocr.TextMatcher.AppServices.TextMatches.Repositories;
diff --git a/src/Nocr.TextMatcher.AppServices/TextMatches/Services/ITextMatchService.cs b/src/Nocr.TextMatcher.AppServices/TextMatches/Services/ITextMatchService.cs
index de88b38..1e7c450 100644
--- a/src/Nocr.TextMatcher.AppServices/TextMatches/Services/ITextMatchService.cs
+++ b/src/Nocr.TextMatcher.AppServices/TextMatches/Services/ITextMatchService.cs
@@ -1,5 +1,5 @@
+using Nocr.TextMatcher.Api.Contracts.TextMatches;
using Nocr.TextMatcher.Api.Contracts.TextMatches.Dto;
-using Nocr.TextMatcher.AppServices.Contracts.TextMatches;
namespace Nocr.TextMatcher.AppServices.TextMatches.Services;
diff --git a/src/Nocr.TextMatcher.AppServices/TextMatches/Services/TextMatchService.cs b/src/Nocr.TextMatcher.AppServices/TextMatches/Services/TextMatchService.cs
index 94da2f9..b94dec1 100644
--- a/src/Nocr.TextMatcher.AppServices/TextMatches/Services/TextMatchService.cs
+++ b/src/Nocr.TextMatcher.AppServices/TextMatches/Services/TextMatchService.cs
@@ -1,5 +1,5 @@
+using Nocr.TextMatcher.Api.Contracts.TextMatches;
using Nocr.TextMatcher.Api.Contracts.TextMatches.Dto;
-using Nocr.TextMatcher.AppServices.Contracts.TextMatches;
using Nocr.TextMatcher.AppServices.TextMatches.Repositories;
using Nocr.TextMatcher.Async.Api.Contracts;
using Nocr.TextMatcher.Core.Dates;
diff --git a/src/Nocr.TextMatcher.AppServices/TextMatches/TextMatch.cs b/src/Nocr.TextMatcher.AppServices/TextMatches/TextMatch.cs
index 9a38a9f..fc2c735 100644
--- a/src/Nocr.TextMatcher.AppServices/TextMatches/TextMatch.cs
+++ b/src/Nocr.TextMatcher.AppServices/TextMatches/TextMatch.cs
@@ -1,5 +1,5 @@
using System.Text.RegularExpressions;
-using Nocr.TextMatcher.AppServices.Contracts.TextMatches;
+using Nocr.TextMatcher.Api.Contracts.TextMatches;
namespace Nocr.TextMatcher.AppServices.TextMatches;
diff --git a/src/Nocr.TextMatcher.Host/Controllers/TextMatchController.cs b/src/Nocr.TextMatcher.Host/Controllers/TextMatchController.cs
index 8f5da47..3831395 100644
--- a/src/Nocr.TextMatcher.Host/Controllers/TextMatchController.cs
+++ b/src/Nocr.TextMatcher.Host/Controllers/TextMatchController.cs
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Mvc;
using Nocr.TextMatcher.Api.Contracts;
using Nocr.TextMatcher.Api.Contracts.TextMatches.Dto;
+using Nocr.TextMatcher.Api.Contracts.TextMatches.Requests;
using Nocr.TextMatcher.AppServices.TextMatches.Services;
namespace Nocr.TextMatcher.Host.Controllers;
diff --git a/tests/Nocr.TextMatcher.AppServices.UnitTests/TextMatchTests.cs b/tests/Nocr.TextMatcher.AppServices.UnitTests/TextMatchTests.cs
index c0a2a3a..758c0bf 100644
--- a/tests/Nocr.TextMatcher.AppServices.UnitTests/TextMatchTests.cs
+++ b/tests/Nocr.TextMatcher.AppServices.UnitTests/TextMatchTests.cs
@@ -1,4 +1,4 @@
-using Nocr.TextMatcher.AppServices.Contracts.TextMatches;
+using Nocr.TextMatcher.Api.Contracts.TextMatches;
using Nocr.TextMatcher.AppServices.TextMatches;
using Xunit;