diff --git a/IRaCIS.Core.API/Controllers/UploadController.cs b/IRaCIS.Core.API/Controllers/UploadController.cs
index 2c6e322d..e9559c04 100644
--- a/IRaCIS.Core.API/Controllers/UploadController.cs
+++ b/IRaCIS.Core.API/Controllers/UploadController.cs
@@ -209,7 +209,7 @@ namespace IRaCIS.Core.API.Controllers
             var (trustedFileNameForFileStorage, fileName) = FileStoreHelper.GetStoreFileName(fileRealName);
 
 
-            relativePath = $"/{StaticData.SystemDataFolder}/{StaticData.DataTemplate}/{trustedFileNameForFileStorage}";
+            relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.SystemDataFolder}/{StaticData.DataTemplate}/{trustedFileNameForFileStorage}";
 
             serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
         }
@@ -230,7 +230,7 @@ namespace IRaCIS.Core.API.Controllers
 
 
 
-            relativePath = $"/{StaticData.SystemDataFolder}/{StaticData.NoticeAttachment}/{trustedFileNameForFileStorage}";
+            relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.SystemDataFolder}/{StaticData.NoticeAttachment}/{trustedFileNameForFileStorage}";
 
             serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
         }
@@ -252,7 +252,7 @@ namespace IRaCIS.Core.API.Controllers
 
             var trustedFileNameForFileStorage = Guid.NewGuid().ToString() + fileRealName;
 
-            relativePath = $"/{StaticData.SystemDataFolder}/{ StaticData.SignDocumentFolder}/{trustedFileNameForFileStorage}";
+            relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.SystemDataFolder}/{ StaticData.SignDocumentFolder}/{trustedFileNameForFileStorage}";
 
             serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
         }
@@ -270,7 +270,7 @@ namespace IRaCIS.Core.API.Controllers
 
             var (trustedFileNameForFileStorage, fileName) = FileStoreHelper.GetStoreFileName(fileRealName);
 
-            relativePath = $"/{StaticData.TrialDataFolder}/{trialId}/{StaticData.SignDocumentFolder}/{trustedFileNameForFileStorage}";
+            relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.TrialDataFolder}/{trialId}/{StaticData.SignDocumentFolder}/{trustedFileNameForFileStorage}";
 
              serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);               
         }
diff --git a/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs b/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs
index 1981d401..1fd1f1c0 100644
--- a/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs
@@ -78,7 +78,7 @@ namespace IRaCIS.Core.Application.Contracts
                
                 var (trustedFileNameForFileStorage, fileName) = FileStoreHelper.GetStoreFileName(file.FileName);
 
-                var relativePath = $"/{StaticData.TrialDataFolder}/{sv.TrialId}/{sv.SiteId}/{sv.SubjectId}/{subjectVisitId}/{StaticData.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}";
+                var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.TrialDataFolder}/{sv.TrialId}/{sv.SiteId}/{sv.SubjectId}/{subjectVisitId}/{StaticData.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}";
 
                 var filePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
 
diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
index 57e5bf20..d9b1360d 100644
--- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
+++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
@@ -273,7 +273,7 @@ namespace IRaCIS.Core.Application.Contracts
         {
             var (trustedFileNameForFileStorage, fileName)   = FileStoreHelper.GetStoreFileName(entry.Key); 
 
-            var relativePath = $"/{StaticData.TrialDataFolder}/{sv.TrialId}/{sv.SiteId}/{sv.SubjectId}/{subjectVisitId}/{StaticData.NoneDicomFolder}/{trustedFileNameForFileStorage}";
+            var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.TrialDataFolder}/{sv.TrialId}/{sv.SiteId}/{sv.SubjectId}/{subjectVisitId}/{StaticData.NoneDicomFolder}/{trustedFileNameForFileStorage}";
 
             var filePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);