From e3e6015f1a30147a82072f244393e6f1ea52ea3d Mon Sep 17 00:00:00 2001
From: Christo du Toit <christo@dutoit.co.uk>
Date: Thu, 2 May 2024 15:29:42 +0100
Subject: [PATCH] CODE RUB: Updated Namespaces

---
 LICENSE                                       |  21 ------
 ...LibPostalClient.sln => LibPostalClient.sln |   8 +-
 .../License.txt => License.txt                |   0
 ...SISL.LibPostalClient.Infrastructure.csproj |   2 +-
 .../Program.cs                                |   4 +-
 .../Services/ScriptGenerationService.cs       |   6 +-
 .../LibPostalTests.Logic.ExpandAddress.cs     |   2 +-
 .../LibPostalTests.Logic.ParseAddress.cs      |   2 +-
 .../LibPostalTests.cs                         |   6 +-
 ...up.LibPostalClient.Tests.Acceptance.csproj |   2 +-
 ...SL.LibPostalClient.Tests.Acceptance.csproj |  70 ++++++++++++++++++
 ...- Backup.LibPostalClient.Tests.Unit.csproj |   2 +-
 .../NHSISL.LibPostalClient.Tests.Unit.csproj  |  43 +++++++++++
 ...lServiceTests .Validations.ParseAddress.cs |   6 +-
 ...alServiceTests.Exceptions.ExpandAddress.cs |   4 +-
 ...talServiceTests.Exceptions.ParseAddress.cs |   4 +-
 ...bPostalServiceTests.Logic.ExpandAddress.cs |   2 +-
 ...ibPostalServiceTests.Logic.ParseAddress.cs |   2 +-
 ...lServiceTests.Validations.ExpandAddress.cs |   6 +-
 .../LibPostals/LibPostalServiceTests.cs       |   6 +-
 .../Brokers/LibPostal/ILibPostalBroker.cs     |   2 +-
 .../Brokers/LibPostal/LibPostalBroker.cs      |   4 +-
 .../Clients/ILibPostalClient.cs               |   2 +-
 .../Clients/LibPostalClient.cs                |  14 ++--
 .../Data/address_expansions/.gitignore        |   0
 .../Data/address_parser/.gitignore            |   0
 .../Data/language_classifier/.gitignore       |   0
 .../Data/numex/.gitignore                     |   0
 .../Data/transliteration/.gitignore           |   0
 .../LibPostal/LibPostalConfiguration.cs       |   2 +-
 .../Models/Brokers/LibPostal/ParserOptions.cs |   2 +-
 .../LibPostalClientConfigurationException.cs  |   2 +-
 .../LibPostalClientDependencyException.cs     |   2 +-
 .../LibPostalClientServiceException.cs        |   2 +-
 .../LibPostalClientValidationException.cs     |   2 +-
 .../FailedLibPostalServiceException.cs        |   2 +-
 .../InvalidArgumentLibPostalException.cs      |   2 +-
 .../LibPostalDependencyException.cs           |   2 +-
 .../LibPostalDependencyValidationException.cs |   2 +-
 .../Exceptions/LibPostalServiceException.cs   |   2 +-
 .../LibPostalValidationException.cs           |   2 +-
 .../NHSISL.LibPostalClient.csproj             |  30 +++++---
 .../NHSISL.LibPostalClient.targets            |   0
 .../Resources/LibPostalClient.png             | Bin
 .../Services/LibPostal/ILibPostalService.cs   |   2 +-
 .../LibPostal/LibPostal.Exceptions.cs         |   6 +-
 .../LibPostal/LibPostal.Validations.cs        |   4 +-
 .../Services/LibPostal/LibPostalService.cs    |   4 +-
 .../libpostal-1.dll                           | Bin
 .../libpostal-1.so                            | Bin
 .../libpostal.cs                              |   0
 .../libpostal.h                               |   0
 .../libpostalpartial.cs                       |   0
 .../.gitignore                                |   0
 .../Data/address_expansions/.gitignore        |   0
 .../Data/address_parser/.gitignore            |   0
 .../Data/geodb/.gitignore                     |   0
 .../Data/geonames/.gitignore                  |   0
 .../Data/libpostal/.gitignore                 |   0
 .../Data/numex/.gitignore                     |   0
 .../Data/transliteration/.gitignore           |   0
 .../License.txt                               |   0
 .../NHSISL.LibPostalNet.csproj                |   0
 .../NHSISL.LibPostalNet.targets               |   0
 .../Properties/AssemblyInfo.cs                |   0
 .../README.md                                 |   0
 .../Resources/LibPostalNet.png                | Bin
 .../libpostal-1.dll                           | Bin
 .../libpostal-1.so                            | Bin
 .../libpostal.cs                              |   0
 .../libpostal.h                               |   0
 .../libpostalpartial.cs                       |   0
 .../postal.dll                                | Bin
 README.md                                     |   4 +-
 74 files changed, 196 insertions(+), 98 deletions(-)
 delete mode 100644 LICENSE
 rename NEL.LibPostalClient.sln => LibPostalClient.sln (80%)
 rename NEL.LibPostalClient/License.txt => License.txt (100%)
 rename NEL.LibPostalClient.Infrastructure/NEL.LibPostalClient.Infrastructure.csproj => NHSISL.LibPostalClient.Infrastructure/NHSISL.LibPostalClient.Infrastructure.csproj (89%)
 rename {NEL.LibPostalClient.Infrastructure => NHSISL.LibPostalClient.Infrastructure}/Program.cs (80%)
 rename {NEL.LibPostalClient.Infrastructure => NHSISL.LibPostalClient.Infrastructure}/Services/ScriptGenerationService.cs (95%)
 rename {NEL.LibPostalClient.Tests.Acceptance => NHSISL.LibPostalClient.Tests.Acceptance}/LibPostalTests.Logic.ExpandAddress.cs (96%)
 rename {NEL.LibPostalClient.Tests.Acceptance => NHSISL.LibPostalClient.Tests.Acceptance}/LibPostalTests.Logic.ParseAddress.cs (96%)
 rename {NEL.LibPostalClient.Tests.Acceptance => NHSISL.LibPostalClient.Tests.Acceptance}/LibPostalTests.cs (88%)
 rename NEL.LibPostalClient.Tests.Acceptance/NEL.LibPostalClient.Tests.Acceptance.csproj => NHSISL.LibPostalClient.Tests.Acceptance/NHSISL - Backup.LibPostalClient.Tests.Acceptance.csproj (97%)
 create mode 100644 NHSISL.LibPostalClient.Tests.Acceptance/NHSISL.LibPostalClient.Tests.Acceptance.csproj
 rename NEL.LibPostalClient.Tests.Unit/NEL.LibPostalClient.Tests.Unit.csproj => NHSISL.LibPostalClient.Tests.Unit/NHSISL - Backup.LibPostalClient.Tests.Unit.csproj (94%)
 create mode 100644 NHSISL.LibPostalClient.Tests.Unit/NHSISL.LibPostalClient.Tests.Unit.csproj
 rename {NEL.LibPostalClient.Tests.Unit => NHSISL.LibPostalClient.Tests.Unit}/Services/Foundations/LibPostals/LibPostalServiceTests .Validations.ParseAddress.cs (90%)
 rename {NEL.LibPostalClient.Tests.Unit => NHSISL.LibPostalClient.Tests.Unit}/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ExpandAddress.cs (93%)
 rename {NEL.LibPostalClient.Tests.Unit => NHSISL.LibPostalClient.Tests.Unit}/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ParseAddress.cs (93%)
 rename {NEL.LibPostalClient.Tests.Unit => NHSISL.LibPostalClient.Tests.Unit}/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ExpandAddress.cs (94%)
 rename {NEL.LibPostalClient.Tests.Unit => NHSISL.LibPostalClient.Tests.Unit}/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ParseAddress.cs (95%)
 rename {NEL.LibPostalClient.Tests.Unit => NHSISL.LibPostalClient.Tests.Unit}/Services/Foundations/LibPostals/LibPostalServiceTests.Validations.ExpandAddress.cs (90%)
 rename {NEL.LibPostalClient.Tests.Unit => NHSISL.LibPostalClient.Tests.Unit}/Services/Foundations/LibPostals/LibPostalServiceTests.cs (87%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Brokers/LibPostal/ILibPostalBroker.cs (88%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Brokers/LibPostal/LibPostalBroker.cs (96%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Clients/ILibPostalClient.cs (91%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Clients/LibPostalClient.cs (94%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Data/address_expansions/.gitignore (100%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Data/address_parser/.gitignore (100%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Data/language_classifier/.gitignore (100%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Data/numex/.gitignore (100%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Data/transliteration/.gitignore (100%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Models/Brokers/LibPostal/LibPostalConfiguration.cs (90%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Models/Brokers/LibPostal/ParserOptions.cs (86%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Models/Clients/LibPostal/Exceptions/LibPostalClientConfigurationException.cs (85%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Models/Clients/LibPostal/Exceptions/LibPostalClientDependencyException.cs (86%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Models/Clients/LibPostal/Exceptions/LibPostalClientServiceException.cs (86%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Models/Clients/LibPostal/Exceptions/LibPostalClientValidationException.cs (87%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Models/Foundations/LibPostal/Exceptions/FailedLibPostalServiceException.cs (86%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Models/Foundations/LibPostal/Exceptions/InvalidArgumentLibPostalException.cs (84%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyException.cs (85%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyValidationException.cs (85%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Models/Foundations/LibPostal/Exceptions/LibPostalServiceException.cs (85%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Models/Foundations/LibPostal/Exceptions/LibPostalValidationException.cs (87%)
 rename NEL.LibPostalClient/NEL.LibPostalClient.csproj => NHSISL.LibPostalClient/NHSISL.LibPostalClient.csproj (80%)
 rename NEL.LibPostalClient/NEL.LibPostalClient.targets => NHSISL.LibPostalClient/NHSISL.LibPostalClient.targets (100%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Resources/LibPostalClient.png (100%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Services/LibPostal/ILibPostalService.cs (90%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Services/LibPostal/LibPostal.Exceptions.cs (94%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Services/LibPostal/LibPostal.Validations.cs (91%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/Services/LibPostal/LibPostalService.cs (91%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/libpostal-1.dll (100%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/libpostal-1.so (100%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/libpostal.cs (100%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/libpostal.h (100%)
 rename {NEL.LibPostalClient => NHSISL.LibPostalClient}/libpostalpartial.cs (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/.gitignore (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/Data/address_expansions/.gitignore (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/Data/address_parser/.gitignore (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/Data/geodb/.gitignore (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/Data/geonames/.gitignore (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/Data/libpostal/.gitignore (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/Data/numex/.gitignore (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/Data/transliteration/.gitignore (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/License.txt (100%)
 rename NEL.LibPostalNet/NEL.LibPostalNet.csproj => NHSISL.LibPostalNet/NHSISL.LibPostalNet.csproj (100%)
 rename NEL.LibPostalNet/NEL.LibPostalNet.targets => NHSISL.LibPostalNet/NHSISL.LibPostalNet.targets (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/Properties/AssemblyInfo.cs (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/README.md (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/Resources/LibPostalNet.png (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/libpostal-1.dll (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/libpostal-1.so (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/libpostal.cs (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/libpostal.h (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/libpostalpartial.cs (100%)
 rename {NEL.LibPostalNet => NHSISL.LibPostalNet}/postal.dll (100%)

diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 04cda82..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Intelligent Solutions for London
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/NEL.LibPostalClient.sln b/LibPostalClient.sln
similarity index 80%
rename from NEL.LibPostalClient.sln
rename to LibPostalClient.sln
index 06c4278..15e7f38 100644
--- a/NEL.LibPostalClient.sln
+++ b/LibPostalClient.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34202.233
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEL.LibPostalClient", "NEL.LibPostalClient\NEL.LibPostalClient.csproj", "{8F716F8C-89E2-4B11-8220-234499B00A33}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHSISL.LibPostalClient", "NHSISL.LibPostalClient\NHSISL.LibPostalClient.csproj", "{8F716F8C-89E2-4B11-8220-234499B00A33}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEL.LibPostalClient.Infrastructure", "NEL.LibPostalClient.Infrastructure\NEL.LibPostalClient.Infrastructure.csproj", "{B99B5798-18E4-4DD9-8CDB-A08F6B89CA19}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHSISL.LibPostalClient.Infrastructure", "NHSISL.LibPostalClient.Infrastructure\NHSISL.LibPostalClient.Infrastructure.csproj", "{B99B5798-18E4-4DD9-8CDB-A08F6B89CA19}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEL.LibPostalClient.Tests.Unit", "NEL.LibPostalClient.Tests.Unit\NEL.LibPostalClient.Tests.Unit.csproj", "{7184373C-6377-4A12-8C05-95C2B87D56F5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHSISL.LibPostalClient.Tests.Unit", "NHSISL.LibPostalClient.Tests.Unit\NHSISL.LibPostalClient.Tests.Unit.csproj", "{7184373C-6377-4A12-8C05-95C2B87D56F5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEL.LibPostalClient.Tests.Acceptance", "NEL.LibPostalClient.Tests.Acceptance\NEL.LibPostalClient.Tests.Acceptance.csproj", "{AB0D7591-3461-4E2B-BA6B-08A0063F9D50}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHSISL.LibPostalClient.Tests.Acceptance", "NHSISL.LibPostalClient.Tests.Acceptance\NHSISL.LibPostalClient.Tests.Acceptance.csproj", "{AB0D7591-3461-4E2B-BA6B-08A0063F9D50}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/NEL.LibPostalClient/License.txt b/License.txt
similarity index 100%
rename from NEL.LibPostalClient/License.txt
rename to License.txt
diff --git a/NEL.LibPostalClient.Infrastructure/NEL.LibPostalClient.Infrastructure.csproj b/NHSISL.LibPostalClient.Infrastructure/NHSISL.LibPostalClient.Infrastructure.csproj
similarity index 89%
rename from NEL.LibPostalClient.Infrastructure/NEL.LibPostalClient.Infrastructure.csproj
rename to NHSISL.LibPostalClient.Infrastructure/NHSISL.LibPostalClient.Infrastructure.csproj
index f847271..7ebe4e1 100644
--- a/NEL.LibPostalClient.Infrastructure/NEL.LibPostalClient.Infrastructure.csproj
+++ b/NHSISL.LibPostalClient.Infrastructure/NHSISL.LibPostalClient.Infrastructure.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<IsPackable>false</IsPackable>
diff --git a/NEL.LibPostalClient.Infrastructure/Program.cs b/NHSISL.LibPostalClient.Infrastructure/Program.cs
similarity index 80%
rename from NEL.LibPostalClient.Infrastructure/Program.cs
rename to NHSISL.LibPostalClient.Infrastructure/Program.cs
index 4692d81..dff982b 100644
--- a/NEL.LibPostalClient.Infrastructure/Program.cs
+++ b/NHSISL.LibPostalClient.Infrastructure/Program.cs
@@ -2,9 +2,9 @@
 // Copyright (c) North East London ICB. All rights reserved.
 // ---------------------------------------------------------------
 
-using NEL.LibPostalClient.Infrastructure.Services;
+using NHSISL.LibPostalClient.Infrastructure.Services;
 
-namespace NEL.LibPostalClient.Infrastructure
+namespace NHSISL.LibPostalClient.Infrastructure
 {
     internal class Program
     {
diff --git a/NEL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs b/NHSISL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs
similarity index 95%
rename from NEL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs
rename to NHSISL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs
index 79721c0..077c7aa 100644
--- a/NEL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs
+++ b/NHSISL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs
@@ -7,7 +7,7 @@
 using ADotNet.Models.Pipelines.GithubPipelines.DotNets.Tasks;
 using ADotNet.Models.Pipelines.GithubPipelines.DotNets.Tasks.SetupDotNetTaskV3s;
 
-namespace NEL.LibPostalClient.Infrastructure.Services
+namespace NHSISL.LibPostalClient.Infrastructure.Services
 {
     internal class ScriptGenerationService
     {
@@ -22,7 +22,7 @@ public void GenerateBuildScript()
 
             var githubPipeline = new GithubPipeline
             {
-                Name = "NEL.LibPostalClient Build",
+                Name = "Build",
 
                 OnEvents = new Events
                 {
@@ -91,7 +91,7 @@ public void GenerateBuildScript()
                         new TagJob(
                             runsOn: BuildMachines.UbuntuLatest,
                             dependsOn: "build",
-                            projectRelativePath: "NEL.LibPostalClient/NEL.LibPostalClient.csproj",
+                            projectRelativePath: "NHSISL.LibPostalClient/NHSISL.LibPostalClient.csproj",
                             githubToken: "${{ secrets.PAT_FOR_TAGGING }}",
                             branchName: branchName)
                     },
diff --git a/NEL.LibPostalClient.Tests.Acceptance/LibPostalTests.Logic.ExpandAddress.cs b/NHSISL.LibPostalClient.Tests.Acceptance/LibPostalTests.Logic.ExpandAddress.cs
similarity index 96%
rename from NEL.LibPostalClient.Tests.Acceptance/LibPostalTests.Logic.ExpandAddress.cs
rename to NHSISL.LibPostalClient.Tests.Acceptance/LibPostalTests.Logic.ExpandAddress.cs
index e66c801..129c4ca 100644
--- a/NEL.LibPostalClient.Tests.Acceptance/LibPostalTests.Logic.ExpandAddress.cs
+++ b/NHSISL.LibPostalClient.Tests.Acceptance/LibPostalTests.Logic.ExpandAddress.cs
@@ -6,7 +6,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace NEL.LibPostalClient.Tests.Acceptance
+namespace NHSISL.LibPostalClient.Tests.Acceptance
 {
     public partial class LibPostalTest
     {
diff --git a/NEL.LibPostalClient.Tests.Acceptance/LibPostalTests.Logic.ParseAddress.cs b/NHSISL.LibPostalClient.Tests.Acceptance/LibPostalTests.Logic.ParseAddress.cs
similarity index 96%
rename from NEL.LibPostalClient.Tests.Acceptance/LibPostalTests.Logic.ParseAddress.cs
rename to NHSISL.LibPostalClient.Tests.Acceptance/LibPostalTests.Logic.ParseAddress.cs
index 292c2d9..ac3e63c 100644
--- a/NEL.LibPostalClient.Tests.Acceptance/LibPostalTests.Logic.ParseAddress.cs
+++ b/NHSISL.LibPostalClient.Tests.Acceptance/LibPostalTests.Logic.ParseAddress.cs
@@ -7,7 +7,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace NEL.LibPostalClient.Tests.Acceptance
+namespace NHSISL.LibPostalClient.Tests.Acceptance
 {
     public partial class LibPostalTest
     {
diff --git a/NEL.LibPostalClient.Tests.Acceptance/LibPostalTests.cs b/NHSISL.LibPostalClient.Tests.Acceptance/LibPostalTests.cs
similarity index 88%
rename from NEL.LibPostalClient.Tests.Acceptance/LibPostalTests.cs
rename to NHSISL.LibPostalClient.Tests.Acceptance/LibPostalTests.cs
index eaa8fa1..618d63d 100644
--- a/NEL.LibPostalClient.Tests.Acceptance/LibPostalTests.cs
+++ b/NHSISL.LibPostalClient.Tests.Acceptance/LibPostalTests.cs
@@ -4,10 +4,10 @@
 
 using System.IO;
 using System.Reflection;
-using NEL.LibPostalClient.Clients;
-using NEL.LibPostalClient.Models.Brokers.LibPostal;
+using NHSISL.LibPostalClient.Clients;
+using NHSISL.LibPostalClient.Models.Brokers.LibPostal;
 
-namespace NEL.LibPostalClient.Tests.Acceptance
+namespace NHSISL.LibPostalClient.Tests.Acceptance
 {
     public partial class LibPostalTest
     {
diff --git a/NEL.LibPostalClient.Tests.Acceptance/NEL.LibPostalClient.Tests.Acceptance.csproj b/NHSISL.LibPostalClient.Tests.Acceptance/NHSISL - Backup.LibPostalClient.Tests.Acceptance.csproj
similarity index 97%
rename from NEL.LibPostalClient.Tests.Acceptance/NEL.LibPostalClient.Tests.Acceptance.csproj
rename to NHSISL.LibPostalClient.Tests.Acceptance/NHSISL - Backup.LibPostalClient.Tests.Acceptance.csproj
index 8460938..778975a 100644
--- a/NEL.LibPostalClient.Tests.Acceptance/NEL.LibPostalClient.Tests.Acceptance.csproj
+++ b/NHSISL.LibPostalClient.Tests.Acceptance/NHSISL - Backup.LibPostalClient.Tests.Acceptance.csproj	
@@ -35,7 +35,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\NEL.LibPostalClient\NEL.LibPostalClient.csproj" />
+	  <ProjectReference Include="..\NHSISL.LibPostalClient\NHSISL.LibPostalClient.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/NHSISL.LibPostalClient.Tests.Acceptance/NHSISL.LibPostalClient.Tests.Acceptance.csproj b/NHSISL.LibPostalClient.Tests.Acceptance/NHSISL.LibPostalClient.Tests.Acceptance.csproj
new file mode 100644
index 0000000..6e6ac86
--- /dev/null
+++ b/NHSISL.LibPostalClient.Tests.Acceptance/NHSISL.LibPostalClient.Tests.Acceptance.csproj
@@ -0,0 +1,70 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>disable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<IsPackable>false</IsPackable>
+		<IsTestProject>true</IsTestProject>
+		<Configurations>Debug;Release;Test;Acceptance</Configurations>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+	  <Optimize>False</Optimize>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="CompareNETObjects" Version="4.82.0" />
+		<PackageReference Include="DeepCloner" Version="0.10.4" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+		<PackageReference Include="Moq" Version="4.20.69" />
+		<PackageReference Include="Tynamix.ObjectFiller" Version="1.5.8" />
+		<PackageReference Include="Xeption" Version="2.6.0" />
+		<PackageReference Include="xunit" Version="2.6.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.0">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\NHSISL.LibPostalClient\NHSISL.LibPostalClient.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Update="local.appsettings.json">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+
+	<Target Name="CleanLibPostal" AfterTargets="Clean">
+		<RemoveDir Directories="$(TargetDir)Data\libpostal"></RemoveDir>
+		<Delete Files="$(TargetDir)LibpostalData.zip" />
+		<Delete Files="$(TargetDir)libpostal-1.dll" Condition="'$(OS)' == 'Windows_NT'" />
+		<Delete Files="$(TargetDir)libpostal-1.so" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'" />
+	</Target>
+
+	<Target Name="PrepLibPostal" BeforeTargets="Build">
+		<Message Importance="high" Text="Checking for LibpostalData.zip" />
+
+		<DownloadFile SourceUrl="https://github.com/NHSISL/LibPostalClient/releases/download/LibPostalData/LibpostalData.zip" DestinationFolder="$(TargetDir)" Condition="!Exists('$(TargetDir)\LibpostalData.zip') == 'True'" />
+		
+	</Target>
+
+	<Target Name="UnzipLibPostal" AfterTargets="PrepLibPostal">
+		<Message Importance="high" Text="Unzipping LibpostalData.zip" />
+
+		<Unzip SourceFiles="$(TargetDir)\LibpostalData.zip" DestinationFolder="$(TargetDir)\Data" OverwriteReadOnlyFiles="true" Condition="Exists('$(TargetDir)\LibpostalData.zip') == 'True'" />
+
+		<Message Importance="high" Text="Unzipped LibpostalData.zip" />
+
+	</Target>
+
+</Project>
diff --git a/NEL.LibPostalClient.Tests.Unit/NEL.LibPostalClient.Tests.Unit.csproj b/NHSISL.LibPostalClient.Tests.Unit/NHSISL - Backup.LibPostalClient.Tests.Unit.csproj
similarity index 94%
rename from NEL.LibPostalClient.Tests.Unit/NEL.LibPostalClient.Tests.Unit.csproj
rename to NHSISL.LibPostalClient.Tests.Unit/NHSISL - Backup.LibPostalClient.Tests.Unit.csproj
index d526ed1..0dd81a4 100644
--- a/NEL.LibPostalClient.Tests.Unit/NEL.LibPostalClient.Tests.Unit.csproj
+++ b/NHSISL.LibPostalClient.Tests.Unit/NHSISL - Backup.LibPostalClient.Tests.Unit.csproj	
@@ -31,7 +31,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\NEL.LibPostalClient\NEL.LibPostalClient.csproj" />
+	  <ProjectReference Include="..\NHSISL.LibPostalClient\NHSISL.LibPostalClient.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/NHSISL.LibPostalClient.Tests.Unit/NHSISL.LibPostalClient.Tests.Unit.csproj b/NHSISL.LibPostalClient.Tests.Unit/NHSISL.LibPostalClient.Tests.Unit.csproj
new file mode 100644
index 0000000..129ecc6
--- /dev/null
+++ b/NHSISL.LibPostalClient.Tests.Unit/NHSISL.LibPostalClient.Tests.Unit.csproj
@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>disable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<IsPackable>false</IsPackable>
+		<IsTestProject>true</IsTestProject>
+		<Configurations>Debug;Release;Test;Acceptance</Configurations>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="CompareNETObjects" Version="4.82.0" />
+		<PackageReference Include="DeepCloner" Version="0.10.4" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+		<PackageReference Include="Moq" Version="4.20.69" />
+		<PackageReference Include="Tynamix.ObjectFiller" Version="1.5.8" />
+		<PackageReference Include="Xeption" Version="2.6.0" />
+		<PackageReference Include="xunit" Version="2.6.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.0">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\NHSISL.LibPostalClient\NHSISL.LibPostalClient.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Update="local.appsettings.json">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+
+</Project>
diff --git a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests .Validations.ParseAddress.cs b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests .Validations.ParseAddress.cs
similarity index 90%
rename from NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests .Validations.ParseAddress.cs
rename to NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests .Validations.ParseAddress.cs
index 74945d6..ea89a42 100644
--- a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests .Validations.ParseAddress.cs	
+++ b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests .Validations.ParseAddress.cs	
@@ -6,11 +6,11 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
-using NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
-using NEL.MESH.Models.Foundations.LibPostal.Exceptions;
+using NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
+using NHSISL.MESH.Models.Foundations.LibPostal.Exceptions;
 using Xunit;
 
-namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
+namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
 {
     public partial class LibPostalServiceTests
     {
diff --git a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ExpandAddress.cs b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ExpandAddress.cs
similarity index 93%
rename from NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ExpandAddress.cs
rename to NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ExpandAddress.cs
index 412cb56..eb3e97d 100644
--- a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ExpandAddress.cs
+++ b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ExpandAddress.cs
@@ -6,10 +6,10 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
-using NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
+using NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
 using Xunit;
 
-namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
+namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
 {
     public partial class LibPostalServiceTests
     {
diff --git a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ParseAddress.cs b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ParseAddress.cs
similarity index 93%
rename from NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ParseAddress.cs
rename to NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ParseAddress.cs
index 29c8b89..d96b5f6 100644
--- a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ParseAddress.cs
+++ b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Exceptions.ParseAddress.cs
@@ -7,10 +7,10 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
-using NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
+using NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
 using Xunit;
 
-namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
+namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
 {
     public partial class LibPostalServiceTests
     {
diff --git a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ExpandAddress.cs b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ExpandAddress.cs
similarity index 94%
rename from NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ExpandAddress.cs
rename to NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ExpandAddress.cs
index 68435c2..1b60249 100644
--- a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ExpandAddress.cs
+++ b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ExpandAddress.cs
@@ -8,7 +8,7 @@
 using Moq;
 using Xunit;
 
-namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
+namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
 {
     public partial class LibPostalServiceTests
     {
diff --git a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ParseAddress.cs b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ParseAddress.cs
similarity index 95%
rename from NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ParseAddress.cs
rename to NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ParseAddress.cs
index 78c46b3..a8a225e 100644
--- a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ParseAddress.cs
+++ b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Logic.ParseAddress.cs
@@ -9,7 +9,7 @@
 using Moq;
 using Xunit;
 
-namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
+namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
 {
     public partial class LibPostalServiceTests
     {
diff --git a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Validations.ExpandAddress.cs b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Validations.ExpandAddress.cs
similarity index 90%
rename from NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Validations.ExpandAddress.cs
rename to NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Validations.ExpandAddress.cs
index 1f6c63a..2f75b74 100644
--- a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Validations.ExpandAddress.cs
+++ b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.Validations.ExpandAddress.cs
@@ -5,11 +5,11 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
-using NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
-using NEL.MESH.Models.Foundations.LibPostal.Exceptions;
+using NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
+using NHSISL.MESH.Models.Foundations.LibPostal.Exceptions;
 using Xunit;
 
-namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
+namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
 {
     public partial class LibPostalServiceTests
     {
diff --git a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.cs b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.cs
similarity index 87%
rename from NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.cs
rename to NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.cs
index 4f15ddc..63a4f02 100644
--- a/NEL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.cs
+++ b/NHSISL.LibPostalClient.Tests.Unit/Services/Foundations/LibPostals/LibPostalServiceTests.cs
@@ -5,12 +5,12 @@
 using System;
 using System.Linq.Expressions;
 using Moq;
-using NEL.LibPostalClient.Brokers.LibPostal;
-using NEL.LibPostalClient.Services.LibPostal;
+using NHSISL.LibPostalClient.Brokers.LibPostal;
+using NHSISL.LibPostalClient.Services.LibPostal;
 using Tynamix.ObjectFiller;
 using Xeptions;
 
-namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
+namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
 {
     public partial class LibPostalServiceTests
     {
diff --git a/NEL.LibPostalClient/Brokers/LibPostal/ILibPostalBroker.cs b/NHSISL.LibPostalClient/Brokers/LibPostal/ILibPostalBroker.cs
similarity index 88%
rename from NEL.LibPostalClient/Brokers/LibPostal/ILibPostalBroker.cs
rename to NHSISL.LibPostalClient/Brokers/LibPostal/ILibPostalBroker.cs
index 2853472..973b6a3 100644
--- a/NEL.LibPostalClient/Brokers/LibPostal/ILibPostalBroker.cs
+++ b/NHSISL.LibPostalClient/Brokers/LibPostal/ILibPostalBroker.cs
@@ -4,7 +4,7 @@
 
 using System.Collections.Generic;
 
-namespace NEL.LibPostalClient.Brokers.LibPostal
+namespace NHSISL.LibPostalClient.Brokers.LibPostal
 {
     internal interface ILibPostalBroker
     {
diff --git a/NEL.LibPostalClient/Brokers/LibPostal/LibPostalBroker.cs b/NHSISL.LibPostalClient/Brokers/LibPostal/LibPostalBroker.cs
similarity index 96%
rename from NEL.LibPostalClient/Brokers/LibPostal/LibPostalBroker.cs
rename to NHSISL.LibPostalClient/Brokers/LibPostal/LibPostalBroker.cs
index bb207e0..8098635 100644
--- a/NEL.LibPostalClient/Brokers/LibPostal/LibPostalBroker.cs
+++ b/NHSISL.LibPostalClient/Brokers/LibPostal/LibPostalBroker.cs
@@ -4,9 +4,9 @@
 
 using System.Collections.Generic;
 using LibPostalNet;
-using NEL.LibPostalClient.Models.Brokers.LibPostal;
+using NHSISL.LibPostalClient.Models.Brokers.LibPostal;
 
-namespace NEL.LibPostalClient.Brokers.LibPostal
+namespace NHSISL.LibPostalClient.Brokers.LibPostal
 {
     internal class LibPostalBroker : ILibPostalBroker
     {
diff --git a/NEL.LibPostalClient/Clients/ILibPostalClient.cs b/NHSISL.LibPostalClient/Clients/ILibPostalClient.cs
similarity index 91%
rename from NEL.LibPostalClient/Clients/ILibPostalClient.cs
rename to NHSISL.LibPostalClient/Clients/ILibPostalClient.cs
index 7cb1eae..7261507 100644
--- a/NEL.LibPostalClient/Clients/ILibPostalClient.cs
+++ b/NHSISL.LibPostalClient/Clients/ILibPostalClient.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace NEL.LibPostalClient.Clients
+namespace NHSISL.LibPostalClient.Clients
 {
     public interface ILibPostalClient
     {
diff --git a/NEL.LibPostalClient/Clients/LibPostalClient.cs b/NHSISL.LibPostalClient/Clients/LibPostalClient.cs
similarity index 94%
rename from NEL.LibPostalClient/Clients/LibPostalClient.cs
rename to NHSISL.LibPostalClient/Clients/LibPostalClient.cs
index d407279..2777819 100644
--- a/NEL.LibPostalClient/Clients/LibPostalClient.cs
+++ b/NHSISL.LibPostalClient/Clients/LibPostalClient.cs
@@ -6,15 +6,15 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using NEL.LibPostalClient.Brokers.LibPostal;
-using NEL.LibPostalClient.Models.Brokers.LibPostal;
-using NEL.LibPostalClient.Models.Clients.LibPostal.Exceptions;
-using NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
-using NEL.LibPostalClient.Services.LibPostal;
-using NEL.MESH.Models.Foundations.LibPostal.Exceptions;
+using NHSISL.LibPostalClient.Brokers.LibPostal;
+using NHSISL.LibPostalClient.Models.Brokers.LibPostal;
+using NHSISL.LibPostalClient.Models.Clients.LibPostal.Exceptions;
+using NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
+using NHSISL.LibPostalClient.Services.LibPostal;
+using NHSISL.MESH.Models.Foundations.LibPostal.Exceptions;
 using Xeptions;
 
-namespace NEL.LibPostalClient.Clients
+namespace NHSISL.LibPostalClient.Clients
 {
     public class LibPostalClient : ILibPostalClient
     {
diff --git a/NEL.LibPostalClient/Data/address_expansions/.gitignore b/NHSISL.LibPostalClient/Data/address_expansions/.gitignore
similarity index 100%
rename from NEL.LibPostalClient/Data/address_expansions/.gitignore
rename to NHSISL.LibPostalClient/Data/address_expansions/.gitignore
diff --git a/NEL.LibPostalClient/Data/address_parser/.gitignore b/NHSISL.LibPostalClient/Data/address_parser/.gitignore
similarity index 100%
rename from NEL.LibPostalClient/Data/address_parser/.gitignore
rename to NHSISL.LibPostalClient/Data/address_parser/.gitignore
diff --git a/NEL.LibPostalClient/Data/language_classifier/.gitignore b/NHSISL.LibPostalClient/Data/language_classifier/.gitignore
similarity index 100%
rename from NEL.LibPostalClient/Data/language_classifier/.gitignore
rename to NHSISL.LibPostalClient/Data/language_classifier/.gitignore
diff --git a/NEL.LibPostalClient/Data/numex/.gitignore b/NHSISL.LibPostalClient/Data/numex/.gitignore
similarity index 100%
rename from NEL.LibPostalClient/Data/numex/.gitignore
rename to NHSISL.LibPostalClient/Data/numex/.gitignore
diff --git a/NEL.LibPostalClient/Data/transliteration/.gitignore b/NHSISL.LibPostalClient/Data/transliteration/.gitignore
similarity index 100%
rename from NEL.LibPostalClient/Data/transliteration/.gitignore
rename to NHSISL.LibPostalClient/Data/transliteration/.gitignore
diff --git a/NEL.LibPostalClient/Models/Brokers/LibPostal/LibPostalConfiguration.cs b/NHSISL.LibPostalClient/Models/Brokers/LibPostal/LibPostalConfiguration.cs
similarity index 90%
rename from NEL.LibPostalClient/Models/Brokers/LibPostal/LibPostalConfiguration.cs
rename to NHSISL.LibPostalClient/Models/Brokers/LibPostal/LibPostalConfiguration.cs
index 28edafe..d8dc72f 100644
--- a/NEL.LibPostalClient/Models/Brokers/LibPostal/LibPostalConfiguration.cs
+++ b/NHSISL.LibPostalClient/Models/Brokers/LibPostal/LibPostalConfiguration.cs
@@ -2,7 +2,7 @@
 // Copyright (c) North East London ICB. All rights reserved.
 // ---------------------------------------------------------------
 
-namespace NEL.LibPostalClient.Models.Brokers.LibPostal
+namespace NHSISL.LibPostalClient.Models.Brokers.LibPostal
 {
     public class LibPostalConfiguration
     {
diff --git a/NEL.LibPostalClient/Models/Brokers/LibPostal/ParserOptions.cs b/NHSISL.LibPostalClient/Models/Brokers/LibPostal/ParserOptions.cs
similarity index 86%
rename from NEL.LibPostalClient/Models/Brokers/LibPostal/ParserOptions.cs
rename to NHSISL.LibPostalClient/Models/Brokers/LibPostal/ParserOptions.cs
index e1f2b31..b7a0018 100644
--- a/NEL.LibPostalClient/Models/Brokers/LibPostal/ParserOptions.cs
+++ b/NHSISL.LibPostalClient/Models/Brokers/LibPostal/ParserOptions.cs
@@ -2,7 +2,7 @@
 // Copyright (c) North East London ICB. All rights reserved.
 // ---------------------------------------------------------------
 
-namespace NEL.LibPostalClient.Models.Brokers.LibPostal
+namespace NHSISL.LibPostalClient.Models.Brokers.LibPostal
 {
     public class ParserOptions
     {
diff --git a/NEL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientConfigurationException.cs b/NHSISL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientConfigurationException.cs
similarity index 85%
rename from NEL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientConfigurationException.cs
rename to NHSISL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientConfigurationException.cs
index 27be3c7..d947c0b 100644
--- a/NEL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientConfigurationException.cs
+++ b/NHSISL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientConfigurationException.cs
@@ -4,7 +4,7 @@
 
 using Xeptions;
 
-namespace NEL.LibPostalClient.Models.Clients.LibPostal.Exceptions
+namespace NHSISL.LibPostalClient.Models.Clients.LibPostal.Exceptions
 {
     public class LibPostalClientConfigurationException : Xeption
     {
diff --git a/NEL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientDependencyException.cs b/NHSISL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientDependencyException.cs
similarity index 86%
rename from NEL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientDependencyException.cs
rename to NHSISL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientDependencyException.cs
index befe500..fcf894c 100644
--- a/NEL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientDependencyException.cs
+++ b/NHSISL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientDependencyException.cs
@@ -4,7 +4,7 @@
 
 using Xeptions;
 
-namespace NEL.LibPostalClient.Models.Clients.LibPostal.Exceptions
+namespace NHSISL.LibPostalClient.Models.Clients.LibPostal.Exceptions
 {
     public class LibPostalClientDependencyException : Xeption
     {
diff --git a/NEL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientServiceException.cs b/NHSISL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientServiceException.cs
similarity index 86%
rename from NEL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientServiceException.cs
rename to NHSISL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientServiceException.cs
index f1daca7..3aebb2d 100644
--- a/NEL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientServiceException.cs
+++ b/NHSISL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientServiceException.cs
@@ -4,7 +4,7 @@
 
 using Xeptions;
 
-namespace NEL.LibPostalClient.Models.Clients.LibPostal.Exceptions
+namespace NHSISL.LibPostalClient.Models.Clients.LibPostal.Exceptions
 {
     public class LibPostalClientServiceException : Xeption
     {
diff --git a/NEL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientValidationException.cs b/NHSISL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientValidationException.cs
similarity index 87%
rename from NEL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientValidationException.cs
rename to NHSISL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientValidationException.cs
index 2a971df..58a40c9 100644
--- a/NEL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientValidationException.cs
+++ b/NHSISL.LibPostalClient/Models/Clients/LibPostal/Exceptions/LibPostalClientValidationException.cs
@@ -5,7 +5,7 @@
 using System.Collections;
 using Xeptions;
 
-namespace NEL.LibPostalClient.Models.Clients.LibPostal.Exceptions
+namespace NHSISL.LibPostalClient.Models.Clients.LibPostal.Exceptions
 {
     public class LibPostalClientValidationException : Xeption
     {
diff --git a/NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/FailedLibPostalServiceException.cs b/NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/FailedLibPostalServiceException.cs
similarity index 86%
rename from NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/FailedLibPostalServiceException.cs
rename to NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/FailedLibPostalServiceException.cs
index 60f2f09..3cfd4ec 100644
--- a/NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/FailedLibPostalServiceException.cs
+++ b/NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/FailedLibPostalServiceException.cs
@@ -5,7 +5,7 @@
 using System;
 using Xeptions;
 
-namespace NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions
+namespace NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions
 {
     public class FailedLibPostalServiceException : Xeption
     {
diff --git a/NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/InvalidArgumentLibPostalException.cs b/NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/InvalidArgumentLibPostalException.cs
similarity index 84%
rename from NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/InvalidArgumentLibPostalException.cs
rename to NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/InvalidArgumentLibPostalException.cs
index f1d3c86..1ffd202 100644
--- a/NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/InvalidArgumentLibPostalException.cs
+++ b/NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/InvalidArgumentLibPostalException.cs
@@ -4,7 +4,7 @@
 
 using Xeptions;
 
-namespace NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions
+namespace NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions
 {
     public class InvalidArgumentLibPostalException : Xeption
     {
diff --git a/NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyException.cs b/NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyException.cs
similarity index 85%
rename from NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyException.cs
rename to NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyException.cs
index d7828aa..352d737 100644
--- a/NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyException.cs
+++ b/NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyException.cs
@@ -4,7 +4,7 @@
 
 using Xeptions;
 
-namespace NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions
+namespace NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions
 {
     internal class LibPostalDependencyException : Xeption
     {
diff --git a/NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyValidationException.cs b/NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyValidationException.cs
similarity index 85%
rename from NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyValidationException.cs
rename to NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyValidationException.cs
index 2491bc9..96d2032 100644
--- a/NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyValidationException.cs
+++ b/NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalDependencyValidationException.cs
@@ -4,7 +4,7 @@
 
 using Xeptions;
 
-namespace NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions
+namespace NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions
 {
     internal class LibPostalDependencyValidationException : Xeption
     {
diff --git a/NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalServiceException.cs b/NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalServiceException.cs
similarity index 85%
rename from NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalServiceException.cs
rename to NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalServiceException.cs
index 2e16939..806257f 100644
--- a/NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalServiceException.cs
+++ b/NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalServiceException.cs
@@ -4,7 +4,7 @@
 
 using Xeptions;
 
-namespace NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions
+namespace NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions
 {
     internal class LibPostalServiceException : Xeption
     {
diff --git a/NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalValidationException.cs b/NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalValidationException.cs
similarity index 87%
rename from NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalValidationException.cs
rename to NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalValidationException.cs
index d971a65..3159d7f 100644
--- a/NEL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalValidationException.cs
+++ b/NHSISL.LibPostalClient/Models/Foundations/LibPostal/Exceptions/LibPostalValidationException.cs
@@ -4,7 +4,7 @@
 
 using Xeptions;
 
-namespace NEL.MESH.Models.Foundations.LibPostal.Exceptions
+namespace NHSISL.MESH.Models.Foundations.LibPostal.Exceptions
 {
     internal class LibPostalValidationException : Xeption
     {
diff --git a/NEL.LibPostalClient/NEL.LibPostalClient.csproj b/NHSISL.LibPostalClient/NHSISL.LibPostalClient.csproj
similarity index 80%
rename from NEL.LibPostalClient/NEL.LibPostalClient.csproj
rename to NHSISL.LibPostalClient/NHSISL.LibPostalClient.csproj
index c57ca6d..9290da4 100644
--- a/NEL.LibPostalClient/NEL.LibPostalClient.csproj
+++ b/NHSISL.LibPostalClient/NHSISL.LibPostalClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<OutputType>Library</OutputType>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<ImplicitUsings>disable</ImplicitUsings>
@@ -10,23 +10,24 @@
 
 		<Title>LibPostal Client</Title>
 		<Authors>Christo du Toit</Authors>
-		<Company>NEL ICB</Company>
-		<Description>  .NET Client wrapper for LibPostal that provides address parsing and normalisation capabilities.  </Description>
+		<Company>NHSISL</Company>
+		<Description>  .NET Client wrapper for LibPostal that provides address parsing and normalization capabilities.  </Description>
 		<Copyright>Copyright (c) NEL ICB</Copyright>
 
 		<PackageIcon>LibPostalClient.png</PackageIcon>
 		<PackageIconUrl />
-		<Version>1.0.0.9</Version>
-		<AssemblyVersion>1.0.0.9</AssemblyVersion>
-		<FileVersion>1.0.0.9</FileVersion>
+		<Version>1.0.0.0</Version>
+		<AssemblyVersion>1.0.0.0</AssemblyVersion>
+		<FileVersion>1.0.0.0</FileVersion>
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<PackageLicenseFile>License.txt</PackageLicenseFile>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageProjectUrl>https://github.com/NHSISL/LibPostalClient</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/NHSISL/LibPostalClient/</RepositoryUrl>
-		<RepositoryType>Github</RepositoryType>
+		<RepositoryType>GitHub</RepositoryType>
 		<PackageTags>.NET Client LibPostal TheStandard</PackageTags>
-		<PackageReleaseNotes>A .NET Client to parse and normalise unstructured adrresses</PackageReleaseNotes>
+		<PackageReleaseNotes>A .NET Client to parse and normalize unstructured addresses</PackageReleaseNotes>
 		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 	</PropertyGroup>
 
@@ -56,7 +57,7 @@
 		<Content Include="libpostal.h" />
 		<Content Include="libpostal-1.dll" PackagePath="contentFiles\windows\libpostal-1.dll"/>
 		<Content Include="libpostal-1.so" PackagePath="contentFiles\linux_x86_64\libpostal-1.dll"/>
-		<Content Include="NEL.LibPostalClient.targets" PackagePath="build\NEL.LibPostalClient.targets" />
+		<Content Include="NHSISL.LibPostalClient.targets" PackagePath="build\NHSISL.LibPostalClient.targets" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -76,7 +77,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="License.txt">
+		<None Include="..\README.md">
+			<Pack>true</Pack>
+			<PackagePath></PackagePath>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Include="..\License.txt">
 			<Pack>True</Pack>
 			<PackagePath></PackagePath>
 		</None>
@@ -87,8 +93,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<InternalsVisibleTo Include="NEL.LibPostalClient.Tests.Unit" />
-		<InternalsVisibleTo Include="NEL.LibPostalClient.Tests.Acceptance" />
+		<InternalsVisibleTo Include="NHSISL.LibPostalClient.Tests.Unit" />
+		<InternalsVisibleTo Include="NHSISL.LibPostalClient.Tests.Acceptance" />
 		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
 	</ItemGroup>
 
diff --git a/NEL.LibPostalClient/NEL.LibPostalClient.targets b/NHSISL.LibPostalClient/NHSISL.LibPostalClient.targets
similarity index 100%
rename from NEL.LibPostalClient/NEL.LibPostalClient.targets
rename to NHSISL.LibPostalClient/NHSISL.LibPostalClient.targets
diff --git a/NEL.LibPostalClient/Resources/LibPostalClient.png b/NHSISL.LibPostalClient/Resources/LibPostalClient.png
similarity index 100%
rename from NEL.LibPostalClient/Resources/LibPostalClient.png
rename to NHSISL.LibPostalClient/Resources/LibPostalClient.png
diff --git a/NEL.LibPostalClient/Services/LibPostal/ILibPostalService.cs b/NHSISL.LibPostalClient/Services/LibPostal/ILibPostalService.cs
similarity index 90%
rename from NEL.LibPostalClient/Services/LibPostal/ILibPostalService.cs
rename to NHSISL.LibPostalClient/Services/LibPostal/ILibPostalService.cs
index 634a607..61a5f95 100644
--- a/NEL.LibPostalClient/Services/LibPostal/ILibPostalService.cs
+++ b/NHSISL.LibPostalClient/Services/LibPostal/ILibPostalService.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace NEL.LibPostalClient.Services.LibPostal
+namespace NHSISL.LibPostalClient.Services.LibPostal
 {
     internal interface ILibPostalService
     {
diff --git a/NEL.LibPostalClient/Services/LibPostal/LibPostal.Exceptions.cs b/NHSISL.LibPostalClient/Services/LibPostal/LibPostal.Exceptions.cs
similarity index 94%
rename from NEL.LibPostalClient/Services/LibPostal/LibPostal.Exceptions.cs
rename to NHSISL.LibPostalClient/Services/LibPostal/LibPostal.Exceptions.cs
index b3985d2..72cb8ea 100644
--- a/NEL.LibPostalClient/Services/LibPostal/LibPostal.Exceptions.cs
+++ b/NHSISL.LibPostalClient/Services/LibPostal/LibPostal.Exceptions.cs
@@ -5,11 +5,11 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
-using NEL.MESH.Models.Foundations.LibPostal.Exceptions;
+using NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
+using NHSISL.MESH.Models.Foundations.LibPostal.Exceptions;
 using Xeptions;
 
-namespace NEL.LibPostalClient.Services.LibPostal
+namespace NHSISL.LibPostalClient.Services.LibPostal
 {
     internal partial class LibPostalService
     {
diff --git a/NEL.LibPostalClient/Services/LibPostal/LibPostal.Validations.cs b/NHSISL.LibPostalClient/Services/LibPostal/LibPostal.Validations.cs
similarity index 91%
rename from NEL.LibPostalClient/Services/LibPostal/LibPostal.Validations.cs
rename to NHSISL.LibPostalClient/Services/LibPostal/LibPostal.Validations.cs
index 7a85b7f..a0e82c1 100644
--- a/NEL.LibPostalClient/Services/LibPostal/LibPostal.Validations.cs
+++ b/NHSISL.LibPostalClient/Services/LibPostal/LibPostal.Validations.cs
@@ -3,10 +3,10 @@
 // ---------------------------------------------------------------
 
 using System;
-using NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
+using NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
 using Xeptions;
 
-namespace NEL.LibPostalClient.Services.LibPostal
+namespace NHSISL.LibPostalClient.Services.LibPostal
 {
     internal partial class LibPostalService
     {
diff --git a/NEL.LibPostalClient/Services/LibPostal/LibPostalService.cs b/NHSISL.LibPostalClient/Services/LibPostal/LibPostalService.cs
similarity index 91%
rename from NEL.LibPostalClient/Services/LibPostal/LibPostalService.cs
rename to NHSISL.LibPostalClient/Services/LibPostal/LibPostalService.cs
index 9d0943a..a460c89 100644
--- a/NEL.LibPostalClient/Services/LibPostal/LibPostalService.cs
+++ b/NHSISL.LibPostalClient/Services/LibPostal/LibPostalService.cs
@@ -4,9 +4,9 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using NEL.LibPostalClient.Brokers.LibPostal;
+using NHSISL.LibPostalClient.Brokers.LibPostal;
 
-namespace NEL.LibPostalClient.Services.LibPostal
+namespace NHSISL.LibPostalClient.Services.LibPostal
 {
     internal partial class LibPostalService : ILibPostalService
     {
diff --git a/NEL.LibPostalClient/libpostal-1.dll b/NHSISL.LibPostalClient/libpostal-1.dll
similarity index 100%
rename from NEL.LibPostalClient/libpostal-1.dll
rename to NHSISL.LibPostalClient/libpostal-1.dll
diff --git a/NEL.LibPostalClient/libpostal-1.so b/NHSISL.LibPostalClient/libpostal-1.so
similarity index 100%
rename from NEL.LibPostalClient/libpostal-1.so
rename to NHSISL.LibPostalClient/libpostal-1.so
diff --git a/NEL.LibPostalClient/libpostal.cs b/NHSISL.LibPostalClient/libpostal.cs
similarity index 100%
rename from NEL.LibPostalClient/libpostal.cs
rename to NHSISL.LibPostalClient/libpostal.cs
diff --git a/NEL.LibPostalClient/libpostal.h b/NHSISL.LibPostalClient/libpostal.h
similarity index 100%
rename from NEL.LibPostalClient/libpostal.h
rename to NHSISL.LibPostalClient/libpostal.h
diff --git a/NEL.LibPostalClient/libpostalpartial.cs b/NHSISL.LibPostalClient/libpostalpartial.cs
similarity index 100%
rename from NEL.LibPostalClient/libpostalpartial.cs
rename to NHSISL.LibPostalClient/libpostalpartial.cs
diff --git a/NEL.LibPostalNet/.gitignore b/NHSISL.LibPostalNet/.gitignore
similarity index 100%
rename from NEL.LibPostalNet/.gitignore
rename to NHSISL.LibPostalNet/.gitignore
diff --git a/NEL.LibPostalNet/Data/address_expansions/.gitignore b/NHSISL.LibPostalNet/Data/address_expansions/.gitignore
similarity index 100%
rename from NEL.LibPostalNet/Data/address_expansions/.gitignore
rename to NHSISL.LibPostalNet/Data/address_expansions/.gitignore
diff --git a/NEL.LibPostalNet/Data/address_parser/.gitignore b/NHSISL.LibPostalNet/Data/address_parser/.gitignore
similarity index 100%
rename from NEL.LibPostalNet/Data/address_parser/.gitignore
rename to NHSISL.LibPostalNet/Data/address_parser/.gitignore
diff --git a/NEL.LibPostalNet/Data/geodb/.gitignore b/NHSISL.LibPostalNet/Data/geodb/.gitignore
similarity index 100%
rename from NEL.LibPostalNet/Data/geodb/.gitignore
rename to NHSISL.LibPostalNet/Data/geodb/.gitignore
diff --git a/NEL.LibPostalNet/Data/geonames/.gitignore b/NHSISL.LibPostalNet/Data/geonames/.gitignore
similarity index 100%
rename from NEL.LibPostalNet/Data/geonames/.gitignore
rename to NHSISL.LibPostalNet/Data/geonames/.gitignore
diff --git a/NEL.LibPostalNet/Data/libpostal/.gitignore b/NHSISL.LibPostalNet/Data/libpostal/.gitignore
similarity index 100%
rename from NEL.LibPostalNet/Data/libpostal/.gitignore
rename to NHSISL.LibPostalNet/Data/libpostal/.gitignore
diff --git a/NEL.LibPostalNet/Data/numex/.gitignore b/NHSISL.LibPostalNet/Data/numex/.gitignore
similarity index 100%
rename from NEL.LibPostalNet/Data/numex/.gitignore
rename to NHSISL.LibPostalNet/Data/numex/.gitignore
diff --git a/NEL.LibPostalNet/Data/transliteration/.gitignore b/NHSISL.LibPostalNet/Data/transliteration/.gitignore
similarity index 100%
rename from NEL.LibPostalNet/Data/transliteration/.gitignore
rename to NHSISL.LibPostalNet/Data/transliteration/.gitignore
diff --git a/NEL.LibPostalNet/License.txt b/NHSISL.LibPostalNet/License.txt
similarity index 100%
rename from NEL.LibPostalNet/License.txt
rename to NHSISL.LibPostalNet/License.txt
diff --git a/NEL.LibPostalNet/NEL.LibPostalNet.csproj b/NHSISL.LibPostalNet/NHSISL.LibPostalNet.csproj
similarity index 100%
rename from NEL.LibPostalNet/NEL.LibPostalNet.csproj
rename to NHSISL.LibPostalNet/NHSISL.LibPostalNet.csproj
diff --git a/NEL.LibPostalNet/NEL.LibPostalNet.targets b/NHSISL.LibPostalNet/NHSISL.LibPostalNet.targets
similarity index 100%
rename from NEL.LibPostalNet/NEL.LibPostalNet.targets
rename to NHSISL.LibPostalNet/NHSISL.LibPostalNet.targets
diff --git a/NEL.LibPostalNet/Properties/AssemblyInfo.cs b/NHSISL.LibPostalNet/Properties/AssemblyInfo.cs
similarity index 100%
rename from NEL.LibPostalNet/Properties/AssemblyInfo.cs
rename to NHSISL.LibPostalNet/Properties/AssemblyInfo.cs
diff --git a/NEL.LibPostalNet/README.md b/NHSISL.LibPostalNet/README.md
similarity index 100%
rename from NEL.LibPostalNet/README.md
rename to NHSISL.LibPostalNet/README.md
diff --git a/NEL.LibPostalNet/Resources/LibPostalNet.png b/NHSISL.LibPostalNet/Resources/LibPostalNet.png
similarity index 100%
rename from NEL.LibPostalNet/Resources/LibPostalNet.png
rename to NHSISL.LibPostalNet/Resources/LibPostalNet.png
diff --git a/NEL.LibPostalNet/libpostal-1.dll b/NHSISL.LibPostalNet/libpostal-1.dll
similarity index 100%
rename from NEL.LibPostalNet/libpostal-1.dll
rename to NHSISL.LibPostalNet/libpostal-1.dll
diff --git a/NEL.LibPostalNet/libpostal-1.so b/NHSISL.LibPostalNet/libpostal-1.so
similarity index 100%
rename from NEL.LibPostalNet/libpostal-1.so
rename to NHSISL.LibPostalNet/libpostal-1.so
diff --git a/NEL.LibPostalNet/libpostal.cs b/NHSISL.LibPostalNet/libpostal.cs
similarity index 100%
rename from NEL.LibPostalNet/libpostal.cs
rename to NHSISL.LibPostalNet/libpostal.cs
diff --git a/NEL.LibPostalNet/libpostal.h b/NHSISL.LibPostalNet/libpostal.h
similarity index 100%
rename from NEL.LibPostalNet/libpostal.h
rename to NHSISL.LibPostalNet/libpostal.h
diff --git a/NEL.LibPostalNet/libpostalpartial.cs b/NHSISL.LibPostalNet/libpostalpartial.cs
similarity index 100%
rename from NEL.LibPostalNet/libpostalpartial.cs
rename to NHSISL.LibPostalNet/libpostalpartial.cs
diff --git a/NEL.LibPostalNet/postal.dll b/NHSISL.LibPostalNet/postal.dll
similarity index 100%
rename from NEL.LibPostalNet/postal.dll
rename to NHSISL.LibPostalNet/postal.dll
diff --git a/README.md b/README.md
index 63c1d9b..bc675e9 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,11 @@
 [![The Standard - COMPLIANT](https://img.shields.io/badge/The_Standard-COMPLIANT-2ea44f)](https://github.com/hassanhabib/The-Standard)
 
 # Introduction
-The NEL.LibPostalClient is a Standard compliant wrapper for libpostal (https://github.com/openvenues/libpostal) which parses and normalises addresses. It is designed to take unstructured address data, such as a mailing address written in natural language, and convert it into a structured format that can be more easily processed by software systems.
+The NHSISL.LibPostalClient is a Standard compliant wrapper for Libpostal (https://github.com/openvenues/libpostal) which parses and normalizes addresses. It is designed to take unstructured address data, such as a mailing address written in natural language, and convert it into a structured format that can be more easily processed by software systems.
 
 # Key Features
 ## Address Parsing: 
-Libpostal can break down an address into its constituent components, such as street names, cities, states, postal codes, and more. This makes it easier to work with address data programmatically.
+Libpostal can break down an address into its constituent components, such as street names, cities, states, postal codes, and more. This makes it easier to work with and compare address data.
 
 ## Address Normalization: 
 It can normalize addresses to a consistent format, reducing variations and inconsistencies that may exist in address data.