diff --git a/Rdmp.Dicom.Tests/TestProcessBasedCacheSource.cs b/Rdmp.Dicom.Tests/TestProcessBasedCacheSource.cs
index 04deafa..d9446f2 100644
--- a/Rdmp.Dicom.Tests/TestProcessBasedCacheSource.cs
+++ b/Rdmp.Dicom.Tests/TestProcessBasedCacheSource.cs
@@ -44,10 +44,11 @@ public void TestWithEcho()
         var dir = new DirectoryInfo(TestContext.CurrentContext.WorkDirectory);
         var loadDir = LoadDirectory.CreateDirectoryStructure(dir, "blah", true);
 
-        lmd.LocationOfForLoadingDirectory = Path.Join(loadDir.RootPath.FullName, "Data", "ForLoading");
-        lmd.LocationOfForArchivingDirectory = Path.Join(loadDir.RootPath.FullName, "Data", "ForArchiving");
-        lmd.LocationOfExecutablesDirectory = Path.Join(loadDir.RootPath.FullName, "Executables");
-        lmd.LocationOfCacheDirectory = Path.Join(loadDir.RootPath.FullName, "Cache"); lmd.SaveToDatabase();
+        lmd.LocationOfForLoadingDirectory = loadDir.ForLoading.FullName;
+        lmd.LocationOfForArchivingDirectory = loadDir.ForArchiving.FullName;
+        lmd.LocationOfExecutablesDirectory = loadDir.ExecutablesPath.FullName;
+        lmd.LocationOfCacheDirectory = loadDir.Cache.FullName;
+        lmd.SaveToDatabase();
 
         source.PreInitialize(new CacheFetchRequestProvider(cp), ThrowImmediatelyDataLoadEventListener.Quiet);
         source.PreInitialize(cp.CatalogueRepository, ThrowImmediatelyDataLoadEventListener.Quiet);
diff --git a/Rdmp.Dicom/CommandExecution/ExecuteCommandCFind.cs b/Rdmp.Dicom/CommandExecution/ExecuteCommandCFind.cs
index ce3a347..76e2709 100644
--- a/Rdmp.Dicom/CommandExecution/ExecuteCommandCFind.cs
+++ b/Rdmp.Dicom/CommandExecution/ExecuteCommandCFind.cs
@@ -30,10 +30,10 @@ public ExecuteCommandCFind(IBasicActivateItems activator, string start, string e
 
         var dir = Directory.CreateDirectory(outDir);
         var results = LoadDirectory.CreateDirectoryStructure(dir, "out", true);
-        lmd.LocationOfForLoadingDirectory = Path.Join(results.RootPath.FullName, "Data", "ForLoading");
-        lmd.LocationOfForArchivingDirectory = Path.Join(results.RootPath.FullName, "Data", "ForArchiving");
-        lmd.LocationOfExecutablesDirectory = Path.Join(results.RootPath.FullName, "Executables");
-        lmd.LocationOfCacheDirectory = Path.Join(results.RootPath.FullName, "Cache");
+        lmd.LocationOfForLoadingDirectory = results.ForLoading.FullName;
+        lmd.LocationOfForArchivingDirectory = results.ForArchiving.FullName;
+        lmd.LocationOfExecutablesDirectory = results.ExecutablesPath.FullName;
+        lmd.LocationOfCacheDirectory = results.Cache.FullName;
         lmd.SaveToDatabase();
 
         var lp = new LoadProgress(memory, lmd);
diff --git a/Rdmp.Dicom/CommandExecution/ExecuteCommandCreateNewImagingDatasetSuite.cs b/Rdmp.Dicom/CommandExecution/ExecuteCommandCreateNewImagingDatasetSuite.cs
index 6345f03..6fb99e0 100644
--- a/Rdmp.Dicom/CommandExecution/ExecuteCommandCreateNewImagingDatasetSuite.cs
+++ b/Rdmp.Dicom/CommandExecution/ExecuteCommandCreateNewImagingDatasetSuite.cs
@@ -183,10 +183,10 @@ public override void Execute()
         new Core.Logging.LogManager(_loggingServer).CreateNewLoggingTaskIfNotExists(loadName);
 
         var projDir = LoadDirectory.CreateDirectoryStructure(_projectDirectory, "ImageLoading", true);
-        NewLoadMetadata.LocationOfForLoadingDirectory = Path.Join(projDir.RootPath.FullName, "Data", "ForLoading");
-        NewLoadMetadata.LocationOfForArchivingDirectory = Path.Join(projDir.RootPath.FullName, "Data", "ForArchiving");
-        NewLoadMetadata.LocationOfExecutablesDirectory = Path.Join(projDir.RootPath.FullName, "Executables");
-        NewLoadMetadata.LocationOfCacheDirectory = Path.Join(projDir.RootPath.FullName, "Cache");
+        NewLoadMetadata.LocationOfForLoadingDirectory = projDir.ForLoading.FullName;
+        NewLoadMetadata.LocationOfForArchivingDirectory = projDir.ForArchiving.FullName;
+        NewLoadMetadata.LocationOfExecutablesDirectory = projDir.ExecutablesPath.FullName;
+        NewLoadMetadata.LocationOfCacheDirectory = projDir.Cache.FullName;
         NewLoadMetadata.SaveToDatabase();
 
         /////////////////////////////////////////////Attacher////////////////////////////
diff --git a/Rdmp.Dicom/CommandExecution/ExecuteCommandPacsFetch.cs b/Rdmp.Dicom/CommandExecution/ExecuteCommandPacsFetch.cs
index 36fd96b..cc42076 100644
--- a/Rdmp.Dicom/CommandExecution/ExecuteCommandPacsFetch.cs
+++ b/Rdmp.Dicom/CommandExecution/ExecuteCommandPacsFetch.cs
@@ -30,10 +30,10 @@ public ExecuteCommandPacsFetch(IBasicActivateItems activator, string start, stri
 
         var dir = Directory.CreateDirectory(outDir);
         var results = LoadDirectory.CreateDirectoryStructure(dir, "out", true);
-        lmd.LocationOfForLoadingDirectory = Path.Join(results.RootPath.FullName, "Data", "ForLoading");
-        lmd.LocationOfForArchivingDirectory = Path.Join(results.RootPath.FullName, "Data", "ForArchiving");
-        lmd.LocationOfExecutablesDirectory = Path.Join(results.RootPath.FullName, "Executables");
-        lmd.LocationOfCacheDirectory = Path.Join(results.RootPath.FullName, "Cache");
+        lmd.LocationOfForLoadingDirectory = results.ForLoading.FullName;
+        lmd.LocationOfForArchivingDirectory = results.ForArchiving.FullName;
+        lmd.LocationOfExecutablesDirectory = results.ExecutablesPath.FullName;
+        lmd.LocationOfCacheDirectory = results.Cache.FullName;
         lmd.SaveToDatabase();
 
         var lp = new LoadProgress(memory, lmd);