diff --git a/HarmonyDB and OneShelf.sln b/HarmonyDB and OneShelf.sln
index 5528dc06..73c33597 100644
--- a/HarmonyDB and OneShelf.sln	
+++ b/HarmonyDB and OneShelf.sln	
@@ -127,9 +127,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarmonyDB.Index.Api.Client"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OneShelf.Sources.Self", "OneShelf.Sources.Self", "{B9B1BB37-376A-413A-8F4C-CB6F61C70FE6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarmonyDB.Sources.Api.Model", "HarmonyDB.Sources\HarmonyDB.Sources.Api.Model\HarmonyDB.Sources.Api.Model.csproj", "{8BEB2357-0B54-416C-AE1A-1409F46E13F5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarmonyDB.Source.Api.Model", "HarmonyDB.Sources\HarmonyDB.Sources.Api.Model\HarmonyDB.Source.Api.Model.csproj", "{8BEB2357-0B54-416C-AE1A-1409F46E13F5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarmonyDB.Sources.Api.Client", "HarmonyDB.Sources\HarmonyDB.Sources.Api.Client\HarmonyDB.Sources.Api.Client.csproj", "{AFF2ABDE-31BE-4B37-B28D-A675A9001B29}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarmonyDB.Source.Api.Client", "HarmonyDB.Sources\HarmonyDB.Sources.Api.Client\HarmonyDB.Source.Api.Client.csproj", "{AFF2ABDE-31BE-4B37-B28D-A675A9001B29}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OneShelf.Frontend.Api.Client", "OneShelf.Frontend\OneShelf.Frontend.Api.Client\OneShelf.Frontend.Api.Client.csproj", "{57EDF7D7-14B6-416B-B4F0-5A28D472D9BF}"
 EndProject
@@ -157,13 +157,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{CD898B20
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "test\test.csproj", "{B5BF58FE-4FB4-4019-9E2A-E09223D36AD1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HarmonyDB.Sources", "HarmonyDB.Sources", "{EA9513E0-A98A-40F1-B158-D3FEEF63BE65}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HarmonyDB.Common", "HarmonyDB.Common", "{2950865E-9D1A-406E-B0C6-4C249E2E4D61}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarmonyDB.Common", "HarmonyDB.Common\HarmonyDB.Common\HarmonyDB.Common.csproj", "{36D7C835-0DE5-4FD3-A489-820A1D121EE4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneShelf.Common.Api.Client", "OneShelf.Common\OneShelf.Common.Api.Client\OneShelf.Common.Api.Client.csproj", "{92969108-D9C8-4FF8-B083-B10463EB0FEC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OneShelf.Common.Api.Client", "OneShelf.Common\OneShelf.Common.Api.Client\OneShelf.Common.Api.Client.csproj", "{92969108-D9C8-4FF8-B083-B10463EB0FEC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HarmonyDB.Source", "HarmonyDB.Source", "{3E91BCAD-3270-42AB-96BB-3F5A092CE64F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -456,8 +456,8 @@ Global
 		{0BC5AC04-6EC2-4EAC-B33F-999AC1196E08} = {7548FF8E-E1B9-4939-96E9-03DBD5236709}
 		{4F71D4FC-3171-432D-879B-99448B4D3498} = {2950865E-9D1A-406E-B0C6-4C249E2E4D61}
 		{39939E3D-6F08-446E-A04F-1E9AE30CCBFD} = {7548FF8E-E1B9-4939-96E9-03DBD5236709}
-		{8BEB2357-0B54-416C-AE1A-1409F46E13F5} = {EA9513E0-A98A-40F1-B158-D3FEEF63BE65}
-		{AFF2ABDE-31BE-4B37-B28D-A675A9001B29} = {EA9513E0-A98A-40F1-B158-D3FEEF63BE65}
+		{8BEB2357-0B54-416C-AE1A-1409F46E13F5} = {3E91BCAD-3270-42AB-96BB-3F5A092CE64F}
+		{AFF2ABDE-31BE-4B37-B28D-A675A9001B29} = {3E91BCAD-3270-42AB-96BB-3F5A092CE64F}
 		{57EDF7D7-14B6-416B-B4F0-5A28D472D9BF} = {EDC67D14-C978-46D5-A98B-743C1480C1A8}
 		{C1F71C37-1A69-4182-9876-9AA61D5BAF58} = {B9B1BB37-376A-413A-8F4C-CB6F61C70FE6}
 		{C59CD11B-E781-49A2-906E-D9F200CFA1B5} = {B9B1BB37-376A-413A-8F4C-CB6F61C70FE6}
diff --git a/HarmonyDB.Index/HarmonyDB.Index.Api.Client/IndexApiClient.cs b/HarmonyDB.Index/HarmonyDB.Index.Api.Client/IndexApiClient.cs
index ba04eee6..e22061c6 100644
--- a/HarmonyDB.Index/HarmonyDB.Index.Api.Client/IndexApiClient.cs
+++ b/HarmonyDB.Index/HarmonyDB.Index.Api.Client/IndexApiClient.cs
@@ -1,8 +1,8 @@
 using HarmonyDB.Index.Api.Model;
 using HarmonyDB.Index.Api.Model.VInternal;
-using HarmonyDB.Sources.Api.Model;
-using HarmonyDB.Sources.Api.Model.V1;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Model;
+using HarmonyDB.Source.Api.Model.V1;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.Extensions.Options;
 using OneShelf.Authorization.Api.Model;
 using OneShelf.Common.Api.Client;
@@ -17,37 +17,37 @@ public IndexApiClient(IHttpClientFactory httpClientFactory, IOptions<ApiClientOp
     }
 
     public async Task<string> V1GetSongsDirect(string request)
-        => await PostDirect(SourcesApiUrls.V1GetSongs, request);
+        => await PostDirect(SourceApiUrls.V1GetSongs, request);
 
     public async Task<GetSongResponse> V1GetSong(Identity identity, string externalId)
-        => await Post<GetSongRequest, GetSongResponse>(SourcesApiUrls.V1GetSong, new()
+        => await Post<GetSongRequest, GetSongResponse>(SourceApiUrls.V1GetSong, new()
         {
             Identity = identity,
             ExternalId = externalId,
         });
 
     public async Task<GetSongsResponse> V1GetSongs(Identity identity, List<string> externalIds)
-        => await Post<GetSongsRequest, GetSongsResponse>(SourcesApiUrls.V1GetSongs, new()
+        => await Post<GetSongsRequest, GetSongsResponse>(SourceApiUrls.V1GetSongs, new()
         {
             Identity = identity,
             ExternalIds = externalIds,
         });
 
     public async Task V1Ping()
-        => await Ping(SourcesApiUrls.V1Ping);
+        => await Ping(SourceApiUrls.V1Ping);
 
     public async Task<SearchResponse> V1Search(SearchRequest request)
-        => await Post<SearchRequest, SearchResponse>(SourcesApiUrls.V1Search, request);
+        => await Post<SearchRequest, SearchResponse>(SourceApiUrls.V1Search, request);
 
     public async Task<SearchHeader> V1GetSearchHeader(Identity identity, string externalId)
-        => (await Post<GetSearchHeaderRequest, GetSearchHeaderResponse>(SourcesApiUrls.V1GetSearchHeader, new()
+        => (await Post<GetSearchHeaderRequest, GetSearchHeaderResponse>(SourceApiUrls.V1GetSearchHeader, new()
         {
             Identity = identity,
             ExternalId = externalId,
         })).SearchHeader;
 
     public async Task<Dictionary<string, UriAttributes>> V1GetSourcesAndExternalIds(Identity identity, IEnumerable<Uri> uris)
-        => (await Post<GetSourcesAndExternalIdsRequest, GetSourcesAndExternalIdsResponse>(SourcesApiUrls.V1GetSourcesAndExternalIds, new()
+        => (await Post<GetSourcesAndExternalIdsRequest, GetSourcesAndExternalIdsResponse>(SourceApiUrls.V1GetSourcesAndExternalIds, new()
         {
             Identity = identity,
             Uris = uris.ToList(),
diff --git a/HarmonyDB.Index/HarmonyDB.Index.Api.Model/HarmonyDB.Index.Api.Model.csproj b/HarmonyDB.Index/HarmonyDB.Index.Api.Model/HarmonyDB.Index.Api.Model.csproj
index 258fd189..34ad45f7 100644
--- a/HarmonyDB.Index/HarmonyDB.Index.Api.Model/HarmonyDB.Index.Api.Model.csproj
+++ b/HarmonyDB.Index/HarmonyDB.Index.Api.Model/HarmonyDB.Index.Api.Model.csproj
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\..\OneShelf.Authorization\OneShelf.Authorization.Api.Model\OneShelf.Authorization.Api.Model.csproj" />
     <ProjectReference Include="..\..\OneShelf.Common\OneShelf.Common\OneShelf.Common.csproj" />
     <ProjectReference Include="..\..\HarmonyDB.Common\HarmonyDB.Common.Representations.OneShelf\HarmonyDB.Common.Representations.OneShelf.csproj" />
-    <ProjectReference Include="..\..\HarmonyDB.Sources\HarmonyDB.Sources.Api.Model\HarmonyDB.Sources.Api.Model.csproj" />
+    <ProjectReference Include="..\..\HarmonyDB.Sources\HarmonyDB.Sources.Api.Model\HarmonyDB.Source.Api.Model.csproj" />
   </ItemGroup>
 
 	<Target Condition="'$(PushNuget)'=='1'" Name="NugetPackAutoVersioning" AfterTargets="Build">
diff --git a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSearchHeader.cs b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSearchHeader.cs
index 97622661..d7de052b 100644
--- a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSearchHeader.cs
+++ b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSearchHeader.cs
@@ -1,7 +1,7 @@
 using HarmonyDB.Index.BusinessLogic.Services;
-using HarmonyDB.Sources.Api.Client;
-using HarmonyDB.Sources.Api.Model;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Client;
+using HarmonyDB.Source.Api.Model;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.Functions.Worker;
@@ -23,7 +23,7 @@ public GetSearchHeader(ILoggerFactory loggerFactory, AuthorizationApiClient auth
         _sourceResolver = sourceResolver;
     }
 
-    [Function(SourcesApiUrls.V1GetSearchHeader)]
+    [Function(SourceApiUrls.V1GetSearchHeader)]
     public Task<IActionResult> Run(
         [HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [FromBody] GetSearchHeaderRequest request)
         => RunHandler(req, request);
diff --git a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSong.cs b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSong.cs
index 938fb087..9ff6a417 100644
--- a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSong.cs
+++ b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSong.cs
@@ -1,8 +1,7 @@
 using HarmonyDB.Index.Api.Services;
 using HarmonyDB.Index.BusinessLogic.Services;
-using HarmonyDB.Sources.Api.Client;
-using HarmonyDB.Sources.Api.Model;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Model;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.Functions.Worker;
@@ -22,7 +21,7 @@ public GetSong(ILoggerFactory loggerFactory, AuthorizationApiClient authorizatio
             _commonExecutions = commonExecutions;
         }
 
-        [Function(SourcesApiUrls.V1GetSong)]
+        [Function(SourceApiUrls.V1GetSong)]
         public Task<IActionResult> Run([HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [FromBody] GetSongRequest request)
             => RunHandler(req, request);
 
diff --git a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSongs.cs b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSongs.cs
index 35069da3..3e823bcb 100644
--- a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSongs.cs
+++ b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSongs.cs
@@ -1,8 +1,8 @@
 using HarmonyDB.Index.BusinessLogic.Services;
-using HarmonyDB.Sources.Api.Client;
-using HarmonyDB.Sources.Api.Model;
-using HarmonyDB.Sources.Api.Model.V1;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Client;
+using HarmonyDB.Source.Api.Model;
+using HarmonyDB.Source.Api.Model.V1;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.Functions.Worker;
@@ -25,7 +25,7 @@ public GetSongs(ILoggerFactory loggerFactory, AuthorizationApiClient authorizati
             _sourceResolver = sourceResolver;
         }
 
-        [Function(SourcesApiUrls.V1GetSongs)]
+        [Function(SourceApiUrls.V1GetSongs)]
         public Task<IActionResult> Run([HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [FromBody] GetSongsRequest request)
             => RunHandler(req, request);
 
diff --git a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSourcesAndExternalIds.cs b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSourcesAndExternalIds.cs
index f404b2dc..77f95f44 100644
--- a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSourcesAndExternalIds.cs
+++ b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSourcesAndExternalIds.cs
@@ -1,7 +1,6 @@
 using HarmonyDB.Index.Api.Services;
-using HarmonyDB.Sources.Api.Client;
-using HarmonyDB.Sources.Api.Model;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Model;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.Functions.Worker;
@@ -23,7 +22,7 @@ public GetSourcesAndExternalIds(ILoggerFactory loggerFactory, AuthorizationApiCl
         _commonExecutions = commonExecutions;
     }
 
-    [Function(SourcesApiUrls.V1GetSourcesAndExternalIds)]
+    [Function(SourceApiUrls.V1GetSourcesAndExternalIds)]
     public Task<IActionResult> Run(
         [HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [FromBody] GetSourcesAndExternalIdsRequest request)
         => RunHandler(req, request);
diff --git a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/Ping.cs b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/Ping.cs
index 8893ea47..24379b83 100644
--- a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/Ping.cs
+++ b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/Ping.cs
@@ -1,6 +1,6 @@
 using System.Net;
-using HarmonyDB.Sources.Api.Client;
-using HarmonyDB.Sources.Api.Model;
+using HarmonyDB.Source.Api.Client;
+using HarmonyDB.Source.Api.Model;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Extensions.Logging;
@@ -18,7 +18,7 @@ public Ping(ILoggerFactory loggerFactory, SourcesApiClient sourcesApiClient)
             _logger = loggerFactory.CreateLogger<Ping>();
         }
 
-        [Function(SourcesApiUrls.V1Ping)]
+        [Function(SourceApiUrls.V1Ping)]
         public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post")] HttpRequestData req)
         {
             _logger.LogInformation("C# HTTP trigger function processed a request.");
diff --git a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/Search.cs b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/Search.cs
index ca3882b9..0e930948 100644
--- a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/Search.cs
+++ b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/Search.cs
@@ -1,6 +1,6 @@
-using HarmonyDB.Sources.Api.Client;
-using HarmonyDB.Sources.Api.Model;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Client;
+using HarmonyDB.Source.Api.Model;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.Functions.Worker;
@@ -21,7 +21,7 @@ public Search(ILoggerFactory loggerFactory, AuthorizationApiClient authorization
             _sourcesApiClient = sourcesApiClient;
         }
 
-        [Function(SourcesApiUrls.V1Search)]
+        [Function(SourceApiUrls.V1Search)]
         public Task<IActionResult> Run(
             [HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [FromBody] SearchRequest request)
             => RunHandler(req, request);
diff --git a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/VPublic/GetPublic.cs b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/VPublic/GetPublic.cs
index cdc6d3ae..f7fffff9 100644
--- a/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/VPublic/GetPublic.cs
+++ b/HarmonyDB.Index/HarmonyDB.Index.Api/Functions/VPublic/GetPublic.cs
@@ -2,7 +2,7 @@
 using HarmonyDB.Index.Api.Model;
 using HarmonyDB.Index.Api.Model.VPublic;
 using HarmonyDB.Index.Api.Services;
-using HarmonyDB.Sources.Api.Model.V1;
+using HarmonyDB.Source.Api.Model.V1;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.Functions.Worker;
diff --git a/HarmonyDB.Index/HarmonyDB.Index.Api/HarmonyDB.Index.Api.csproj b/HarmonyDB.Index/HarmonyDB.Index.Api/HarmonyDB.Index.Api.csproj
index b7c23b7d..0af10764 100644
--- a/HarmonyDB.Index/HarmonyDB.Index.Api/HarmonyDB.Index.Api.csproj
+++ b/HarmonyDB.Index/HarmonyDB.Index.Api/HarmonyDB.Index.Api.csproj
@@ -22,7 +22,7 @@
     <ProjectReference Include="..\..\OneShelf.Common\OneShelf.Common.Compression\OneShelf.Common.Compression.csproj" />
     <ProjectReference Include="..\..\HarmonyDB.Index\HarmonyDB.Index.Api.Model\HarmonyDB.Index.Api.Model.csproj" />
     <ProjectReference Include="..\..\HarmonyDB.Index\HarmonyDB.Index.BusinessLogic\HarmonyDB.Index.BusinessLogic.csproj" />
-    <ProjectReference Include="..\..\HarmonyDB.Sources\HarmonyDB.Sources.Api.Client\HarmonyDB.Sources.Api.Client.csproj" />
+    <ProjectReference Include="..\..\HarmonyDB.Sources\HarmonyDB.Sources.Api.Client\HarmonyDB.Source.Api.Client.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">
diff --git a/HarmonyDB.Index/HarmonyDB.Index.Api/Program.cs b/HarmonyDB.Index/HarmonyDB.Index.Api/Program.cs
index cbff0fea..fe098e63 100644
--- a/HarmonyDB.Index/HarmonyDB.Index.Api/Program.cs
+++ b/HarmonyDB.Index/HarmonyDB.Index.Api/Program.cs
@@ -2,7 +2,7 @@
 using HarmonyDB.Index.Api.Services;
 using HarmonyDB.Index.BusinessLogic;
 using HarmonyDB.Index.BusinessLogic.Models;
-using HarmonyDB.Sources.Api.Client;
+using HarmonyDB.Source.Api.Client;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/HarmonyDB.Index/HarmonyDB.Index.Api/Services/CommonExecutions.cs b/HarmonyDB.Index/HarmonyDB.Index.Api/Services/CommonExecutions.cs
index f9a954c5..26138bc2 100644
--- a/HarmonyDB.Index/HarmonyDB.Index.Api/Services/CommonExecutions.cs
+++ b/HarmonyDB.Index/HarmonyDB.Index.Api/Services/CommonExecutions.cs
@@ -1,6 +1,6 @@
 using HarmonyDB.Index.BusinessLogic.Services;
-using HarmonyDB.Sources.Api.Client;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Client;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using OneShelf.Common;
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/HarmonyDB.Sources.Api.Client.csproj b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/HarmonyDB.Source.Api.Client.csproj
similarity index 88%
rename from HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/HarmonyDB.Sources.Api.Client.csproj
rename to HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/HarmonyDB.Source.Api.Client.csproj
index 28ebcae3..360038ee 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/HarmonyDB.Sources.Api.Client.csproj
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/HarmonyDB.Source.Api.Client.csproj
@@ -13,7 +13,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\HarmonyDB.Sources\HarmonyDB.Sources.Api.Model\HarmonyDB.Sources.Api.Model.csproj" />
+	  <ProjectReference Include="..\HarmonyDB.Sources.Api.Model\HarmonyDB.Source.Api.Model.csproj" />
 	  <ProjectReference Include="..\..\OneShelf.Common\OneShelf.Common.Api.Client\OneShelf.Common.Api.Client.csproj" />
 	</ItemGroup>
 
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/IServiceCollectionExtensions.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/IServiceCollectionExtensions.cs
index fdf5e90a..eb014afa 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/IServiceCollectionExtensions.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/IServiceCollectionExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace HarmonyDB.Sources.Api.Client;
+namespace HarmonyDB.Source.Api.Client;
 
 // ReSharper disable once InconsistentNaming
 public static class IServiceCollectionExtensions
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourceApiClient.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourceApiClient.cs
index e49b834a..3133bb86 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourceApiClient.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourceApiClient.cs
@@ -1,10 +1,10 @@
-using HarmonyDB.Sources.Api.Model;
-using HarmonyDB.Sources.Api.Model.V1;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Model;
+using HarmonyDB.Source.Api.Model.V1;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using OneShelf.Authorization.Api.Model;
 using OneShelf.Common.Api.Client;
 
-namespace HarmonyDB.Sources.Api.Client;
+namespace HarmonyDB.Source.Api.Client;
 
 internal class SourceApiClient : ApiClientBase<SourceApiClient>
 {
@@ -14,33 +14,33 @@ public SourceApiClient(ApiClientOptions<SourceApiClient> options, IHttpClientFac
     }
 
     public async Task<GetSongResponse> V1GetSong(Identity identity, string externalId)
-        => await Post<GetSongRequest, GetSongResponse>(SourcesApiUrls.V1GetSong, new()
+        => await Post<GetSongRequest, GetSongResponse>(SourceApiUrls.V1GetSong, new()
         {
             Identity = identity,
             ExternalId = externalId,
         });
     public async Task<GetSongsResponse> V1GetSongs(Identity identity, IReadOnlyList<string> externalIds)
-        => await Post<GetSongsRequest, GetSongsResponse>(SourcesApiUrls.V1GetSongs, new()
+        => await Post<GetSongsRequest, GetSongsResponse>(SourceApiUrls.V1GetSongs, new()
         {
             Identity = identity,
             ExternalIds = externalIds,
         });
 
     public async Task V1Ping()
-        => await Ping(SourcesApiUrls.V1Ping);
+        => await Ping(SourceApiUrls.V1Ping);
 
     public async Task<SearchResponse> V1Search(SearchRequest request)
-        => await Post<SearchRequest, SearchResponse>(SourcesApiUrls.V1Search, request);
+        => await Post<SearchRequest, SearchResponse>(SourceApiUrls.V1Search, request);
 
     public async Task<SearchHeader> V1GetSearchHeader(Identity identity, string externalId)
-        => (await Post<GetSearchHeaderRequest, GetSearchHeaderResponse>(SourcesApiUrls.V1GetSearchHeader, new()
+        => (await Post<GetSearchHeaderRequest, GetSearchHeaderResponse>(SourceApiUrls.V1GetSearchHeader, new()
         {
             Identity = identity,
             ExternalId = externalId,
         })).SearchHeader;
 
     public async Task<Dictionary<string, UriAttributes>> V1GetSourcesAndExternalIds(Identity identity, IEnumerable<Uri> uris)
-        => (await Post<GetSourcesAndExternalIdsRequest, GetSourcesAndExternalIdsResponse>(SourcesApiUrls.V1GetSourcesAndExternalIds, new()
+        => (await Post<GetSourcesAndExternalIdsRequest, GetSourcesAndExternalIdsResponse>(SourceApiUrls.V1GetSourcesAndExternalIds, new()
         {
             Identity = identity,
             Uris = uris.ToList(),
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourcesApiClient.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourcesApiClient.cs
index 632e5910..77ad7da4 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourcesApiClient.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourcesApiClient.cs
@@ -1,10 +1,10 @@
-using HarmonyDB.Sources.Api.Model.V1;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Model.V1;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.Extensions.Options;
 using OneShelf.Authorization.Api.Model;
 using OneShelf.Common;
 
-namespace HarmonyDB.Sources.Api.Client;
+namespace HarmonyDB.Source.Api.Client;
 
 public class SourcesApiClient
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourcesApiClientOptions.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourcesApiClientOptions.cs
index 4e27f30c..f042da36 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourcesApiClientOptions.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourcesApiClientOptions.cs
@@ -1,6 +1,6 @@
 using OneShelf.Common.Api.Client;
 
-namespace HarmonyDB.Sources.Api.Client;
+namespace HarmonyDB.Source.Api.Client;
 
 public class SourcesApiClientOptions
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/HarmonyDB.Sources.Api.Model.csproj b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/HarmonyDB.Source.Api.Model.csproj
similarity index 100%
rename from HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/HarmonyDB.Sources.Api.Model.csproj
rename to HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/HarmonyDB.Source.Api.Model.csproj
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/SourcesApiUrls.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/SourcesApiUrls.cs
index ce7ee04d..3c535d9e 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/SourcesApiUrls.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/SourcesApiUrls.cs
@@ -1,6 +1,6 @@
-namespace HarmonyDB.Sources.Api.Model;
+namespace HarmonyDB.Source.Api.Model;
 
-public static class SourcesApiUrls
+public static class SourceApiUrls
 {
     public const string V1GetSongs = nameof(V1GetSongs);
     public const string V1GetSong = nameof(V1GetSong);
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSearchHeaderRequest.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSearchHeaderRequest.cs
index cd2d96f1..40b9db84 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSearchHeaderRequest.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSearchHeaderRequest.cs
@@ -1,6 +1,6 @@
 using OneShelf.Authorization.Api.Model;
 
-namespace HarmonyDB.Sources.Api.Model.V1.Api;
+namespace HarmonyDB.Source.Api.Model.V1.Api;
 
 public class GetSearchHeaderRequest : IRequestWithIdentity
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSearchHeaderResponse.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSearchHeaderResponse.cs
index 68ad019d..7b58969f 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSearchHeaderResponse.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSearchHeaderResponse.cs
@@ -1,4 +1,4 @@
-namespace HarmonyDB.Sources.Api.Model.V1.Api;
+namespace HarmonyDB.Source.Api.Model.V1.Api;
 
 public class GetSearchHeaderResponse
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongRequest.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongRequest.cs
index dbe94925..7f72a8e7 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongRequest.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongRequest.cs
@@ -1,6 +1,6 @@
 using OneShelf.Authorization.Api.Model;
 
-namespace HarmonyDB.Sources.Api.Model.V1.Api;
+namespace HarmonyDB.Source.Api.Model.V1.Api;
 
 public class GetSongRequest : IRequestWithIdentity
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongResponse.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongResponse.cs
index fd6af867..4182dc01 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongResponse.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongResponse.cs
@@ -1,4 +1,4 @@
-namespace HarmonyDB.Sources.Api.Model.V1.Api;
+namespace HarmonyDB.Source.Api.Model.V1.Api;
 
 public class GetSongResponse
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongsRequest.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongsRequest.cs
index 643ffa48..7662f8fd 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongsRequest.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongsRequest.cs
@@ -1,6 +1,6 @@
 using OneShelf.Authorization.Api.Model;
 
-namespace HarmonyDB.Sources.Api.Model.V1.Api;
+namespace HarmonyDB.Source.Api.Model.V1.Api;
 
 public class GetSongsRequest : IRequestWithIdentity
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongsResponse.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongsResponse.cs
index 55359a7d..639034b7 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongsResponse.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongsResponse.cs
@@ -1,4 +1,4 @@
-namespace HarmonyDB.Sources.Api.Model.V1.Api;
+namespace HarmonyDB.Source.Api.Model.V1.Api;
 
 public class GetSongsResponse
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSourcesAndExternalIdsRequest.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSourcesAndExternalIdsRequest.cs
index e2172dfc..1fa7cd12 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSourcesAndExternalIdsRequest.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSourcesAndExternalIdsRequest.cs
@@ -1,6 +1,6 @@
 using OneShelf.Authorization.Api.Model;
 
-namespace HarmonyDB.Sources.Api.Model.V1.Api;
+namespace HarmonyDB.Source.Api.Model.V1.Api;
 
 public class GetSourcesAndExternalIdsRequest : IRequestWithIdentity
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSourcesAndExternalIdsResponse.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSourcesAndExternalIdsResponse.cs
index 0fe9c808..49d8c746 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSourcesAndExternalIdsResponse.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSourcesAndExternalIdsResponse.cs
@@ -1,4 +1,4 @@
-namespace HarmonyDB.Sources.Api.Model.V1.Api;
+namespace HarmonyDB.Source.Api.Model.V1.Api;
 
 public class GetSourcesAndExternalIdsResponse
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/SearchRequest.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/SearchRequest.cs
index d16a60e6..845e0401 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/SearchRequest.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/SearchRequest.cs
@@ -1,6 +1,6 @@
 using OneShelf.Authorization.Api.Model;
 
-namespace HarmonyDB.Sources.Api.Model.V1.Api;
+namespace HarmonyDB.Source.Api.Model.V1.Api;
 
 public class SearchRequest : IRequestWithIdentity
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/SearchResponse.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/SearchResponse.cs
index 870e705b..cd4484d0 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/SearchResponse.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/SearchResponse.cs
@@ -1,4 +1,4 @@
-namespace HarmonyDB.Sources.Api.Model.V1.Api;
+namespace HarmonyDB.Source.Api.Model.V1.Api;
 
 public class SearchResponse
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Chords.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Chords.cs
index ca717112..a3eeea29 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Chords.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Chords.cs
@@ -1,6 +1,6 @@
 using HarmonyDB.Common.Representations.OneShelf;
 
-namespace HarmonyDB.Sources.Api.Model.V1;
+namespace HarmonyDB.Source.Api.Model.V1;
 
 public class Chords : PublicHeaderBase
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/PublicHeaderBase.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/PublicHeaderBase.cs
index 77d4aa01..5309446d 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/PublicHeaderBase.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/PublicHeaderBase.cs
@@ -1,4 +1,4 @@
-namespace HarmonyDB.Sources.Api.Model.V1;
+namespace HarmonyDB.Source.Api.Model.V1;
 
 public class PublicHeaderBase
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/SearchHeader.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/SearchHeader.cs
index 2167afdc..d7233d11 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/SearchHeader.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/SearchHeader.cs
@@ -1,4 +1,4 @@
-namespace HarmonyDB.Sources.Api.Model.V1;
+namespace HarmonyDB.Source.Api.Model.V1;
 
 public class SearchHeader : PublicHeaderBase
 {
diff --git a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/UriAttributes.cs b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/UriAttributes.cs
index 3c5ffff7..4ad9fc24 100644
--- a/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/UriAttributes.cs
+++ b/HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/UriAttributes.cs
@@ -1,4 +1,4 @@
-namespace HarmonyDB.Sources.Api.Model.V1;
+namespace HarmonyDB.Source.Api.Model.V1;
 
 public class UriAttributes
 {
diff --git a/OneShelf.Frontend/OneShelf.Frontend.Api.Client/FrontendApiClient.cs b/OneShelf.Frontend/OneShelf.Frontend.Api.Client/FrontendApiClient.cs
index c5857fa8..c8780dac 100644
--- a/OneShelf.Frontend/OneShelf.Frontend.Api.Client/FrontendApiClient.cs
+++ b/OneShelf.Frontend/OneShelf.Frontend.Api.Client/FrontendApiClient.cs
@@ -1,7 +1,7 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using HarmonyDB.Index.Api.Model;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.Extensions.Options;
 using OneShelf.Authorization.Api.Model;
 using OneShelf.Common.Api.Client;
diff --git a/OneShelf.Frontend/OneShelf.Frontend.Api/Functions/V3/GetPdfs.cs b/OneShelf.Frontend/OneShelf.Frontend.Api/Functions/V3/GetPdfs.cs
index 356081d9..9b737a27 100644
--- a/OneShelf.Frontend/OneShelf.Frontend.Api/Functions/V3/GetPdfs.cs
+++ b/OneShelf.Frontend/OneShelf.Frontend.Api/Functions/V3/GetPdfs.cs
@@ -1,6 +1,6 @@
 using System.Net;
 using HarmonyDB.Index.Api.Client;
-using HarmonyDB.Sources.Api.Model.V1;
+using HarmonyDB.Source.Api.Model.V1;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc;
diff --git a/OneShelf.Frontend/OneShelf.Frontend.Api/Functions/V3/Search.cs b/OneShelf.Frontend/OneShelf.Frontend.Api/Functions/V3/Search.cs
index 0e0a23b0..4ceaf659 100644
--- a/OneShelf.Frontend/OneShelf.Frontend.Api/Functions/V3/Search.cs
+++ b/OneShelf.Frontend/OneShelf.Frontend.Api/Functions/V3/Search.cs
@@ -1,5 +1,5 @@
 using HarmonyDB.Index.Api.Client;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.Functions.Worker;
diff --git a/OneShelf.Frontend/OneShelf.Frontend.Web/Services/Api.cs b/OneShelf.Frontend/OneShelf.Frontend.Web/Services/Api.cs
index b908fe62..b8095c2c 100644
--- a/OneShelf.Frontend/OneShelf.Frontend.Web/Services/Api.cs
+++ b/OneShelf.Frontend/OneShelf.Frontend.Web/Services/Api.cs
@@ -1,5 +1,5 @@
 using HarmonyDB.Common.Representations.OneShelf;
-using HarmonyDB.Sources.Api.Model.V1;
+using HarmonyDB.Source.Api.Model.V1;
 using ApplyRequest = OneShelf.Frontend.Api.Model.V3.Api.ApplyRequest;
 using GetPdfsResponse = OneShelf.Frontend.Api.Model.V3.Api.GetPdfsResponse;
 using OneShelf.Frontend.Api.Client;
diff --git a/OneShelf.Frontend/OneShelf.Frontend.Web/Services/DataProvider.cs b/OneShelf.Frontend/OneShelf.Frontend.Web/Services/DataProvider.cs
index 6749eadd..5b845677 100644
--- a/OneShelf.Frontend/OneShelf.Frontend.Web/Services/DataProvider.cs
+++ b/OneShelf.Frontend/OneShelf.Frontend.Web/Services/DataProvider.cs
@@ -1,7 +1,7 @@
 using System.Collections.Concurrent;
 using System.Text.Json;
 using HarmonyDB.Index.Analysis.Models.V1;
-using HarmonyDB.Sources.Api.Model.V1;
+using HarmonyDB.Source.Api.Model.V1;
 using Nito.AsyncEx;
 using OneShelf.Common;
 using OneShelf.Frontend.SpecificModel;
diff --git a/OneShelf.Frontend/OneShelf.Frontend.Web/Services/SearchContext.cs b/OneShelf.Frontend/OneShelf.Frontend.Web/Services/SearchContext.cs
index e84c8c8a..2b096349 100644
--- a/OneShelf.Frontend/OneShelf.Frontend.Web/Services/SearchContext.cs
+++ b/OneShelf.Frontend/OneShelf.Frontend.Web/Services/SearchContext.cs
@@ -1,4 +1,4 @@
-using HarmonyDB.Sources.Api.Model.V1;
+using HarmonyDB.Source.Api.Model.V1;
 using OneShelf.Common;
 using OneShelf.Common.Songs.FullTextSearch;
 
diff --git a/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/AvailableChords.razor b/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/AvailableChords.razor
index fe5b0cef..b6c65178 100644
--- a/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/AvailableChords.razor
+++ b/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/AvailableChords.razor
@@ -1,6 +1,6 @@
-@using OneShelf.Common
+@using HarmonyDB.Source.Api.Model.V1
+@using OneShelf.Common
 @using OneShelf.Frontend.SpecificModel
-@using HarmonyDB.Sources.Api.Model.V1
 
 @foreach (var (group, i) in Headers.GroupBy(x => (x.Source, x.SpecificAttributes.ToFrontendAttributesV1().SourceColor)).WithIndices())
 {
diff --git a/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/ChordsList.razor b/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/ChordsList.razor
index 517e9d8a..c6a59813 100644
--- a/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/ChordsList.razor
+++ b/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/ChordsList.razor
@@ -1,4 +1,5 @@
-@using OneShelf.Common
+@using HarmonyDB.Source.Api.Model.V1
+@using OneShelf.Common
 @using OneShelf.Frontend.Api.Model.V3.Databasish
 @using OneShelf.Frontend.Api.Model.V3.Illustrations
 @using OneShelf.Frontend.SpecificModel
@@ -6,7 +7,6 @@
 @using OneShelf.Frontend.Web.Services
 @using OneShelf.Frontend.Web.Tools
 @using Version = OneShelf.Frontend.Api.Model.V3.Databasish.Version
-@using HarmonyDB.Sources.Api.Model.V1
 @inject NavigationManager NavigationManager
 @inject IdentityProvider IdentityProvider
 @inject SearchContext SearchContext
diff --git a/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/ChordsView.razor b/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/ChordsView.razor
index 67901c25..be92cb31 100644
--- a/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/ChordsView.razor
+++ b/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/ChordsView.razor
@@ -3,7 +3,7 @@
 @using HarmonyDB.Common.Representations.OneShelf
 @using HarmonyDB.Index.Analysis.Models
 @using HarmonyDB.Index.Analysis.Services
-@using HarmonyDB.Sources.Api.Model.V1
+@using HarmonyDB.Source.Api.Model.V1
 @using Microsoft.Extensions.Options
 @using OneShelf.Common
 @using OneShelf.Frontend.Api.Model.V3.Databasish
diff --git a/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/SearchResultsInternet.razor b/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/SearchResultsInternet.razor
index e68bd222..b7db07af 100644
--- a/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/SearchResultsInternet.razor
+++ b/OneShelf.Frontend/OneShelf.Frontend.Web/Shared/SearchResultsInternet.razor
@@ -1,7 +1,7 @@
-@using OneShelf.Common
+@using HarmonyDB.Source.Api.Model.V1
+@using OneShelf.Common
 @using OneShelf.Frontend.Web.Models
 @using OneShelf.Frontend.Web.Services
-@using HarmonyDB.Sources.Api.Model.V1
 @inject CollectionNavigation CollectionNavigation
 @inject NavigationManager NavigationManager
 @inject DataProvider DataProvider
diff --git a/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/GetSong.cs b/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/GetSong.cs
index b28766ac..b245501b 100644
--- a/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/GetSong.cs
+++ b/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/GetSong.cs
@@ -1,5 +1,5 @@
-using HarmonyDB.Sources.Api.Model;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Model;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.Functions.Worker;
@@ -27,7 +27,7 @@ public GetSong(ILoggerFactory loggerFactory, MetadataBuilder metadataBuilder, Co
             _structureParser = structureParser;
         }
 
-        [Function(SourcesApiUrls.V1GetSong)]
+        [Function(SourceApiUrls.V1GetSong)]
         public Task<IActionResult> Run([HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [Microsoft.Azure.Functions.Worker.Http.FromBody] GetSongRequest request) => RunHandler(req, request);
 
         protected override async Task<GetSongResponse> Execute(HttpRequest httpRequest, GetSongRequest request)
diff --git a/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/GetSongs.cs b/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/GetSongs.cs
index b3bc7467..0d1857d8 100644
--- a/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/GetSongs.cs
+++ b/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/GetSongs.cs
@@ -1,6 +1,6 @@
-using HarmonyDB.Sources.Api.Model;
-using HarmonyDB.Sources.Api.Model.V1;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Model;
+using HarmonyDB.Source.Api.Model.V1;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.Functions.Worker;
@@ -28,7 +28,7 @@ public GetSongs(ILoggerFactory loggerFactory, MetadataBuilder metadataBuilder, C
             _structureParser = structureParser;
         }
 
-        [Function(SourcesApiUrls.V1GetSongs)]
+        [Function(SourceApiUrls.V1GetSongs)]
         public Task<IActionResult> Run([HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [Microsoft.Azure.Functions.Worker.Http.FromBody] GetSongsRequest request) => RunHandler(req, request);
 
         protected override async Task<GetSongsResponse> Execute(HttpRequest httpRequest, GetSongsRequest request)
diff --git a/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/GetSourcesAndExternalIds.cs b/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/GetSourcesAndExternalIds.cs
index af6a7d96..a06dbca9 100644
--- a/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/GetSourcesAndExternalIds.cs
+++ b/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/GetSourcesAndExternalIds.cs
@@ -1,6 +1,6 @@
-using HarmonyDB.Sources.Api.Model;
-using HarmonyDB.Sources.Api.Model.V1;
-using HarmonyDB.Sources.Api.Model.V1.Api;
+using HarmonyDB.Source.Api.Model;
+using HarmonyDB.Source.Api.Model.V1;
+using HarmonyDB.Source.Api.Model.V1.Api;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.Functions.Worker;
@@ -25,7 +25,7 @@ public GetSourcesAndExternalIds(ILoggerFactory loggerFactory, MetadataBuilder me
         _options = options.Value;
     }
 
-    [Function(SourcesApiUrls.V1GetSourcesAndExternalIds)]
+    [Function(SourceApiUrls.V1GetSourcesAndExternalIds)]
     public Task<IActionResult> Run(
         [HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [Microsoft.Azure.Functions.Worker.Http.FromBody] GetSourcesAndExternalIdsRequest request) => RunHandler(req, request);
 
diff --git a/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/Ping.cs b/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/Ping.cs
index 92563b35..6b5b14bd 100644
--- a/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/Ping.cs
+++ b/OneShelf.Sources/OneShelf.Sources.Self.Api/Functions/V1/Ping.cs
@@ -1,5 +1,5 @@
 using System.Net;
-using HarmonyDB.Sources.Api.Model;
+using HarmonyDB.Source.Api.Model;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Extensions.Logging;
@@ -15,7 +15,7 @@ public Ping(ILoggerFactory loggerFactory)
             _logger = loggerFactory.CreateLogger<Ping>();
         }
 
-        [Function(SourcesApiUrls.V1Ping)]
+        [Function(SourceApiUrls.V1Ping)]
         public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post")] HttpRequestData req)
         {
             _logger.LogInformation("C# HTTP trigger function processed a request.");
diff --git a/OneShelf.Sources/OneShelf.Sources.Self.Api/OneShelf.Sources.Self.Api.csproj b/OneShelf.Sources/OneShelf.Sources.Self.Api/OneShelf.Sources.Self.Api.csproj
index 454a7cfc..0010f86a 100644
--- a/OneShelf.Sources/OneShelf.Sources.Self.Api/OneShelf.Sources.Self.Api.csproj
+++ b/OneShelf.Sources/OneShelf.Sources.Self.Api/OneShelf.Sources.Self.Api.csproj
@@ -21,7 +21,7 @@
     <ProjectReference Include="..\..\OneShelf.Common\OneShelf.Common.Api\OneShelf.Common.Api.csproj" />
     <ProjectReference Include="..\..\OneShelf.Frontend\OneShelf.Frontend.SpecificModel\OneShelf.Frontend.SpecificModel.csproj" />
     <ProjectReference Include="..\..\OneShelf.Pdfs\OneShelf.Pdfs.SpecificModel\OneShelf.Pdfs.SpecificModel.csproj" />
-    <ProjectReference Include="..\..\HarmonyDB.Sources\HarmonyDB.Sources.Api.Model\HarmonyDB.Sources.Api.Model.csproj" />
+    <ProjectReference Include="..\..\HarmonyDB.Sources\HarmonyDB.Sources.Api.Model\HarmonyDB.Source.Api.Model.csproj" />
     <ProjectReference Include="..\..\OneShelf.Sources\OneShelf.Sources.Self.Api.Model\OneShelf.Sources.Self.Api.Model.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/OneShelf.Sources/OneShelf.Sources.Self.Api/Services/MetadataBuilder.cs b/OneShelf.Sources/OneShelf.Sources.Self.Api/Services/MetadataBuilder.cs
index 7214dfe2..745c26a9 100644
--- a/OneShelf.Sources/OneShelf.Sources.Self.Api/Services/MetadataBuilder.cs
+++ b/OneShelf.Sources/OneShelf.Sources.Self.Api/Services/MetadataBuilder.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 using HarmonyDB.Common.Representations.OneShelf;
-using HarmonyDB.Sources.Api.Model.V1;
+using HarmonyDB.Source.Api.Model.V1;
 using Microsoft.Extensions.Options;
 using OneShelf.Collectives.Api.Model.V2.Sub;
 using OneShelf.Frontend.SpecificModel;