diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index ce7b2e31..7bf2fba0 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -51,7 +51,7 @@ jobs:
           cmd /c rdmpcli\rdmp.exe cmd describe CreateNewImagingDatasetSuite
       - name: Get Imaging Template
         run: |
-          Invoke-WebRequest -Uri https://raw.githubusercontent.com/HicServices/DicomTypeTranslation/main/Templates/CT.it -OutFile D:\a\RdmpDicom\CT.it
+          Invoke-WebRequest -Uri https://raw.githubusercontent.com/SMI/DicomTypeTranslation/main/Templates/CT.it -OutFile D:\a\RdmpDicom\CT.it
       - name: Integration Tests
         run: |
           cmd /c rdmpcli\rdmp.exe cmd NewObject ConnectionStringKeyword MicrosoftSqlServer TrustServerCertificate yes
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a45c4558..1cd5f14d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,7 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Added MetadataOnly property to FoDicomAnonymiser [#64](https://github.com/HicServices/RdmpDicom/issues/64)
+- Added MetadataOnly property to FoDicomAnonymiser [#64](https://github.com/SMI/RdmpDicom/issues/64)
 
 ## [5.0.10] 2022-06-21
 
@@ -49,7 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [5.0.8] 2022-05-04
 
 ### Changed
-- Corrected resizing for the SemEHR API query builder - [#236](https://github.com/HicServices/RdmpDicom/issues/236)
+- Corrected resizing for the SemEHR API query builder - [#236](https://github.com/SMI/RdmpDicom/issues/236)
 
 ## [5.0.7] 2022-04-26
 
@@ -395,56 +395,56 @@ Updated to be compatible with RDMP 4.2
 
 - Initial commit from private repo
 
-[Unreleased]: https://github.com/HicServices/RdmpDicom/compare/v7.0.0...develop
-[7.0.0]: https://github.com/HicServices/RdmpDicom/compare/v6.0.2...v7.0.0
-[6.0.2]: https://github.com/HicServices/RdmpDicom/compare/v6.0.1...v6.0.2
-[6.0.1]: https://github.com/HicServices/RdmpDicom/compare/v6.0.0...v6.0.1
-[6.0.0]: https://github.com/HicServices/RdmpDicom/compare/v5.0.12...v6.0.0
-[5.0.12]: https://github.com/HicServices/RdmpDicom/compare/v5.0.11...v5.0.12
-[5.0.11]: https://github.com/HicServices/RdmpDicom/compare/v5.0.10...v5.0.11
-[5.0.10]: https://github.com/HicServices/RdmpDicom/compare/v5.0.9...v5.0.10
-[5.0.9]: https://github.com/HicServices/RdmpDicom/compare/v5.0.8...v5.0.9
-[5.0.8]: https://github.com/HicServices/RdmpDicom/compare/v5.0.7...v5.0.8
-[5.0.7]: https://github.com/HicServices/RdmpDicom/compare/v5.0.6...v5.0.7
-[5.0.6]: https://github.com/HicServices/RdmpDicom/compare/v5.0.5...v5.0.6
-[5.0.5]: https://github.com/HicServices/RdmpDicom/compare/v5.0.4...v5.0.5
-[5.0.4]: https://github.com/HicServices/RdmpDicom/compare/v5.0.3...v5.0.4
-[5.0.3]: https://github.com/HicServices/RdmpDicom/compare/v5.0.2...v5.0.3
-[5.0.2]: https://github.com/HicServices/RdmpDicom/compare/v5.0.1...v5.0.2
-[5.0.1]: https://github.com/HicServices/RdmpDicom/compare/v5.0.0...v5.0.1
-[5.0.0]: https://github.com/HicServices/RdmpDicom/compare/v4.0.2...v5.0.0
-[4.0.2]: https://github.com/HicServices/RdmpDicom/compare/v4.0.0...v4.0.2
-[4.0.0]: https://github.com/HicServices/RdmpDicom/compare/v3.0.1...v4.0.0
-[3.0.1]: https://github.com/HicServices/RdmpDicom/compare/v3.0.0...v3.0.1
-[3.0.0]: https://github.com/HicServices/RdmpDicom/compare/v2.2.4...v3.0.0
-[2.2.4]: https://github.com/HicServices/RdmpDicom/compare/v2.2.3...v2.2.4
-[2.2.3]: https://github.com/HicServices/RdmpDicom/compare/v2.2.2...v2.2.3
-[2.2.2]: https://github.com/HicServices/RdmpDicom/compare/v2.2.1...v2.2.2
-[2.2.1]: https://github.com/HicServices/RdmpDicom/compare/v2.1.11...v2.2.1
-[2.1.11]: https://github.com/HicServices/RdmpDicom/compare/v2.1.10...v2.1.11
-[2.1.10]: https://github.com/HicServices/RdmpDicom/compare/v2.1.9...v2.1.10
-[2.1.9]: https://github.com/HicServices/RdmpDicom/compare/v2.1.8...v2.1.9
-[2.1.8]: https://github.com/HicServices/RdmpDicom/compare/v2.1.7...v2.1.8
-[2.1.7]: https://github.com/HicServices/RdmpDicom/compare/v2.1.6...v2.1.7
-[2.1.6]: https://github.com/HicServices/RdmpDicom/compare/v2.1.5...v2.1.6
-[2.1.5]: https://github.com/HicServices/RdmpDicom/compare/v2.1.4...v2.1.5
-[2.1.4]: https://github.com/HicServices/RdmpDicom/compare/v2.1.3...v2.1.4
-[2.1.3]: https://github.com/HicServices/RdmpDicom/compare/v2.1.2...v2.1.3
-[2.1.2]: https://github.com/HicServices/RdmpDicom/compare/v2.1.1...v2.1.2
-[2.1.1]: https://github.com/HicServices/RdmpDicom/compare/v2.1.0...v2.1.1
-[2.1.0]: https://github.com/HicServices/RdmpDicom/compare/v2.0.9...v2.1.0
-[2.0.9]: https://github.com/HicServices/RdmpDicom/compare/v2.0.8...v2.0.9
-[2.0.8]: https://github.com/HicServices/RdmpDicom/compare/v2.0.7...v2.0.8
-[2.0.7]: https://github.com/HicServices/RdmpDicom/compare/v2.0.6...v2.0.7
-[2.0.6]: https://github.com/HicServices/RdmpDicom/compare/v2.0.5...v2.0.6
-[2.0.5]: https://github.com/HicServices/RdmpDicom/compare/v2.0.4...v2.0.5
-[2.0.4]: https://github.com/HicServices/RdmpDicom/compare/v2.0.3...v2.0.4
-[2.0.3]: https://github.com/HicServices/RdmpDicom/compare/v2.0.2...v2.0.3
-[2.0.2]: https://github.com/HicServices/RdmpDicom/compare/v2.0.1...v2.0.2
-[2.0.1]: https://github.com/HicServices/RdmpDicom/compare/v1.3.2...v2.0.1
-[1.3.2]: https://github.com/HicServices/RdmpDicom/compare/v1.3.1...v1.3.2
-[1.3.1]: https://github.com/HicServices/RdmpDicom/compare/v1.3.0...v1.3.1
-[1.3.0]: https://github.com/HicServices/RdmpDicom/compare/v1.1.0...v1.3.0
-[1.1.0]: https://github.com/HicServices/RdmpDicom/compare/v1.0.2...v1.1.0
-[1.0.2]: https://github.com/HicServices/RdmpDicom/compare/1581c5ae3a12db1873f4cf1a930215750ad2ae14...v1.0.2
-[Tag Elevation]:https://github.com/HicServices/DicomTypeTranslation/tree/develop/DicomTypeTranslation/Elevation
+[Unreleased]: https://github.com/SMI/RdmpDicom/compare/v7.0.0...develop
+[7.0.0]: https://github.com/SMI/RdmpDicom/compare/v6.0.2...v7.0.0
+[6.0.2]: https://github.com/SMI/RdmpDicom/compare/v6.0.1...v6.0.2
+[6.0.1]: https://github.com/SMI/RdmpDicom/compare/v6.0.0...v6.0.1
+[6.0.0]: https://github.com/SMI/RdmpDicom/compare/v5.0.12...v6.0.0
+[5.0.12]: https://github.com/SMI/RdmpDicom/compare/v5.0.11...v5.0.12
+[5.0.11]: https://github.com/SMI/RdmpDicom/compare/v5.0.10...v5.0.11
+[5.0.10]: https://github.com/SMI/RdmpDicom/compare/v5.0.9...v5.0.10
+[5.0.9]: https://github.com/SMI/RdmpDicom/compare/v5.0.8...v5.0.9
+[5.0.8]: https://github.com/SMI/RdmpDicom/compare/v5.0.7...v5.0.8
+[5.0.7]: https://github.com/SMI/RdmpDicom/compare/v5.0.6...v5.0.7
+[5.0.6]: https://github.com/SMI/RdmpDicom/compare/v5.0.5...v5.0.6
+[5.0.5]: https://github.com/SMI/RdmpDicom/compare/v5.0.4...v5.0.5
+[5.0.4]: https://github.com/SMI/RdmpDicom/compare/v5.0.3...v5.0.4
+[5.0.3]: https://github.com/SMI/RdmpDicom/compare/v5.0.2...v5.0.3
+[5.0.2]: https://github.com/SMI/RdmpDicom/compare/v5.0.1...v5.0.2
+[5.0.1]: https://github.com/SMI/RdmpDicom/compare/v5.0.0...v5.0.1
+[5.0.0]: https://github.com/SMI/RdmpDicom/compare/v4.0.2...v5.0.0
+[4.0.2]: https://github.com/SMI/RdmpDicom/compare/v4.0.0...v4.0.2
+[4.0.0]: https://github.com/SMI/RdmpDicom/compare/v3.0.1...v4.0.0
+[3.0.1]: https://github.com/SMI/RdmpDicom/compare/v3.0.0...v3.0.1
+[3.0.0]: https://github.com/SMI/RdmpDicom/compare/v2.2.4...v3.0.0
+[2.2.4]: https://github.com/SMI/RdmpDicom/compare/v2.2.3...v2.2.4
+[2.2.3]: https://github.com/SMI/RdmpDicom/compare/v2.2.2...v2.2.3
+[2.2.2]: https://github.com/SMI/RdmpDicom/compare/v2.2.1...v2.2.2
+[2.2.1]: https://github.com/SMI/RdmpDicom/compare/v2.1.11...v2.2.1
+[2.1.11]: https://github.com/SMI/RdmpDicom/compare/v2.1.10...v2.1.11
+[2.1.10]: https://github.com/SMI/RdmpDicom/compare/v2.1.9...v2.1.10
+[2.1.9]: https://github.com/SMI/RdmpDicom/compare/v2.1.8...v2.1.9
+[2.1.8]: https://github.com/SMI/RdmpDicom/compare/v2.1.7...v2.1.8
+[2.1.7]: https://github.com/SMI/RdmpDicom/compare/v2.1.6...v2.1.7
+[2.1.6]: https://github.com/SMI/RdmpDicom/compare/v2.1.5...v2.1.6
+[2.1.5]: https://github.com/SMI/RdmpDicom/compare/v2.1.4...v2.1.5
+[2.1.4]: https://github.com/SMI/RdmpDicom/compare/v2.1.3...v2.1.4
+[2.1.3]: https://github.com/SMI/RdmpDicom/compare/v2.1.2...v2.1.3
+[2.1.2]: https://github.com/SMI/RdmpDicom/compare/v2.1.1...v2.1.2
+[2.1.1]: https://github.com/SMI/RdmpDicom/compare/v2.1.0...v2.1.1
+[2.1.0]: https://github.com/SMI/RdmpDicom/compare/v2.0.9...v2.1.0
+[2.0.9]: https://github.com/SMI/RdmpDicom/compare/v2.0.8...v2.0.9
+[2.0.8]: https://github.com/SMI/RdmpDicom/compare/v2.0.7...v2.0.8
+[2.0.7]: https://github.com/SMI/RdmpDicom/compare/v2.0.6...v2.0.7
+[2.0.6]: https://github.com/SMI/RdmpDicom/compare/v2.0.5...v2.0.6
+[2.0.5]: https://github.com/SMI/RdmpDicom/compare/v2.0.4...v2.0.5
+[2.0.4]: https://github.com/SMI/RdmpDicom/compare/v2.0.3...v2.0.4
+[2.0.3]: https://github.com/SMI/RdmpDicom/compare/v2.0.2...v2.0.3
+[2.0.2]: https://github.com/SMI/RdmpDicom/compare/v2.0.1...v2.0.2
+[2.0.1]: https://github.com/SMI/RdmpDicom/compare/v1.3.2...v2.0.1
+[1.3.2]: https://github.com/SMI/RdmpDicom/compare/v1.3.1...v1.3.2
+[1.3.1]: https://github.com/SMI/RdmpDicom/compare/v1.3.0...v1.3.1
+[1.3.0]: https://github.com/SMI/RdmpDicom/compare/v1.1.0...v1.3.0
+[1.1.0]: https://github.com/SMI/RdmpDicom/compare/v1.0.2...v1.1.0
+[1.0.2]: https://github.com/SMI/RdmpDicom/compare/1581c5ae3a12db1873f4cf1a930215750ad2ae14...v1.0.2
+[Tag Elevation]:https://github.com/SMI/DicomTypeTranslation/tree/develop/DicomTypeTranslation/Elevation
diff --git a/Documentation/DataLoad.md b/Documentation/DataLoad.md
index 57734a17..765f5930 100644
--- a/Documentation/DataLoad.md
+++ b/Documentation/DataLoad.md
@@ -20,7 +20,7 @@ You can create image tables (and an accompanying data load configuration) with t
 
 ![Create Imaging Table](./Images/CreateImagingTables.png)
 
-You can find some [sample templates](https://github.com/HicServices/DicomTypeTranslation/tree/develop/Templates) in the DicomTypeTranslation repository].
+You can find some [sample templates](https://github.com/SMI/DicomTypeTranslation/tree/develop/Templates) in the DicomTypeTranslation repository].
 
 All tables should have a unique primary key e.g. SOPInstanceUID.  Identical duplication is automatically handled when migrating from RAW to STAGING (prior to MERGE with LIVE) so you can use high level fields as primary keys (e.g. StudyInstanceUID) provided all values in all images are the same for that value (e.g. PatientID, PatientBirthDate etc - these are unlikely to change during a study!).
 
@@ -50,4 +50,4 @@ Sometimes there are differences in study/series level tags between images when y
 |[PrimaryKeyCollisionIsolationMutilation](./../Rdmp.Dicom/PipelineComponents/PrimaryKeyCollisionIsolationMutilation.md) | If all the above components failed then you can use this one to isolate the colliding records into a store (and drop them from the data load) |
 
 
-[Image Tables]: #Image-Tables
\ No newline at end of file
+[Image Tables]: #Image-Tables
diff --git a/Packages.md b/Packages.md
index 4cebce37..24b0b1a6 100644
--- a/Packages.md
+++ b/Packages.md
@@ -9,7 +9,7 @@
 
 | Package | Source Code | Version | License | Purpose | Additional Risk Assessment |
 | ------- | ------------| --------| ------- | ------- | -------------------------- |
-| HIC.DicomTypeTranslation | [GitHub](https://github.com/HicServices/DicomTypeTranslation) | [4.0.3](https://www.nuget.org/packages/HIC.DicomTypeTranslation/4.0.3) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Translate dicom types into C# / database types | |
+| HIC.DicomTypeTranslation | [GitHub](https://github.com/SMI/DicomTypeTranslation) | [4.0.3](https://www.nuget.org/packages/HIC.DicomTypeTranslation/4.0.3) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Translate dicom types into C# / database types | |
 | HIC.RDMP.Plugin | [GitHub](https://github.com/HicServices/RDMP) | [8.1.0-rc1](https://www.nuget.org/packages/HIC.RDMP.Plugin/8.1.0-rc1) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Interact with RDMP objects, base classes for plugin components etc | |
 | LibArchive.Net | [GitHub](https://github.com/jas88/libarchive.net) | [0.1.3](https://www.nuget.org/packages/LibArchive.Net/0.1.3) | [BSD] | Access archive formats without the LZMA bugs of SharpCompress | |
 | Terminal.Gui | [GitHub](https://github.com/migueldeicaza/gui.cs) | [1.10.0](https://www.nuget.org/packages/Terminal.Gui/1.10.0) | [MIT] | UIs compatible with RDMP gui command line | |
diff --git a/README.md b/README.md
index 6b89ae20..3b5770c3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build status](https://github.com/HicServices/RdmpDicom/actions/workflows/dotnet-core.yml/badge.svg)](https://github.com/HicServices/RdmpDicom/actions/workflows/dotnet-core.yml) [![Total alerts](https://img.shields.io/lgtm/alerts/g/HicServices/RdmpDicom.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/HicServices/RdmpDicom/alerts/) [![NuGet Badge](https://buildstats.info/nuget/HIC.RDMP.Dicom)](https://buildstats.info/nuget/HIC.RDMP.Dicom)
+[![Build status](https://github.com/SMI/RdmpDicom/actions/workflows/dotnet-core.yml/badge.svg)](https://github.com/SMI/RdmpDicom/actions/workflows/dotnet-core.yml) [![Total alerts](https://img.shields.io/lgtm/alerts/g/SMI/RdmpDicom.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/SMI/RdmpDicom/alerts/) [![NuGet Badge](https://buildstats.info/nuget/HIC.RDMP.Dicom)](https://buildstats.info/nuget/HIC.RDMP.Dicom)
 
 # RdmpDicom
 Plugin for [RDMP](https://github.com/HicServices/RDMP) that adds support for load, linking (with EHR data in relational databases) and extracting anonymous DICOM images for researchers.
@@ -9,7 +9,7 @@ Plugin for [RDMP](https://github.com/HicServices/RDMP) that adds support for loa
 The following demo shows how to deploy and use the RDMP dicom plugin:
 https://youtu.be/j42hmVZKRb4
 
-Releases of the Rdmp.Dicom plugin are hosted in the [Releases section of this Github Repository](https://github.com/HicServices/RdmpDicom/releases).  Once you have downloaded the plugin you can add it to your RDMP instance through the Plugins node in the Tables collection:
+Releases of the Rdmp.Dicom plugin are hosted in the [Releases section of this Github Repository](https://github.com/SMI/RdmpDicom/releases).  Once you have downloaded the plugin you can add it to your RDMP instance through the Plugins node in the Tables collection:
 
 ![Overview](./Documentation/Images/AddPlugin.png)
 
diff --git a/Rdmp.Dicom.Library.nuspec b/Rdmp.Dicom.Library.nuspec
index 437a5e24..44c9d616 100644
--- a/Rdmp.Dicom.Library.nuspec
+++ b/Rdmp.Dicom.Library.nuspec
@@ -6,8 +6,8 @@
         <title>HIC.RDMP.Dicom</title>
         <authors>Health Informatics Centre, University of Dundee</authors>
         <owners>Health Informatics Centre, University of Dundee</owners>
-        <licenseUrl>https://raw.githubusercontent.com/HicServices/RdmpDicom/master/LICENSE</licenseUrl>
-        <projectUrl>https://github.com/HicServices/RdmpDicom</projectUrl>
+        <licenseUrl>https://raw.githubusercontent.com/SMI/RdmpDicom/master/LICENSE</licenseUrl>
+        <projectUrl>https://github.com/SMI/RdmpDicom</projectUrl>
         <iconUrl>https://raw.githubusercontent.com/HicServices/RDMP/master/Application/ResearchDataManagementPlatform/Icon/main.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Rdmp library containing Dicom attachers, Dicom server cache sources etc.</description>