diff --git a/config/orthanc/dicom-web.json b/config/orthanc/dicom-web.json
new file mode 100644
index 0000000..2ca7ccf
--- /dev/null
+++ b/config/orthanc/dicom-web.json
@@ -0,0 +1,20 @@
+{
+  "DicomWeb": {
+    "Enable": true,
+    "Root": "/dicom-web/",
+    "PublicRoot": "/dicom-web/",
+    "EnableWado": true,
+    "WadoRoot": "/wado",
+    "Ssl": false,
+    "Servers": {
+      "main": [
+        "http://orthanc:8042/dicom-web/"
+      ]
+    },
+    "QidoCaseSensitive": true,
+    "MetadataWorkerThreadsCount": 10,
+    "EnableMetadataCache": true,
+    "StudiesMetadata": "Full",
+    "SeriesMetadata": "Full"
+  }
+}
\ No newline at end of file
diff --git a/config/orthanc/dictionary.json b/config/orthanc/dictionary.json
new file mode 100644
index 0000000..d5cdea2
--- /dev/null
+++ b/config/orthanc/dictionary.json
@@ -0,0 +1,7 @@
+{
+  "Dictionary" : {
+    "0011,1060" : [ "LO", "InnowaveUploaderID", 1, 1, "InowavePrivateGroup"],
+    "1971,0010" : [ "CS", "PBSender", 1, 1, "BlackFish"],
+    "1971,1001" : [ "LO", "DicomSenderID", 1, 1, "BlackFish"]
+  }
+}
\ No newline at end of file
diff --git a/config/orthanc/ohif.json b/config/orthanc/ohif.json
new file mode 100644
index 0000000..d3dc7c7
--- /dev/null
+++ b/config/orthanc/ohif.json
@@ -0,0 +1,5 @@
+{
+  "OHIF": {
+    "UserConfiguration": "/usr/local/share/orthanc/ohif.js"
+  }
+}
\ No newline at end of file
diff --git a/config/orthanc.json b/config/orthanc/orthanc.json
similarity index 76%
rename from config/orthanc.json
rename to config/orthanc/orthanc.json
index c177c34..39b0c24 100644
--- a/config/orthanc.json
+++ b/config/orthanc/orthanc.json
@@ -1,5 +1,5 @@
 {
-  "Name": "PixelBridge",
+  "Name": "BlackFish",
   "StorageDirectory": "/var/lib/orthanc/db",
   "IndexDirectory": "/var/lib/orthanc/db",
   "StorageCompression": true,
@@ -11,9 +11,7 @@
     "/usr/share/orthanc/plugins",
     "/usr/local/share/orthanc/plugins"
   ],
-  "OHIF": {
-    "UserConfiguration": "/usr/local/share/orthanc/ohif.js"
-  },
+
   "ExtraMainDicomTags": {
     "Instance": [
       "Rows",
@@ -108,11 +106,6 @@
   "SslVerifyPeers": false,
   "SslTrustedClientCertificates": "trustedClientCertificates.pem",
   
-  "AuthenticationEnabled": false,
-  "RegisteredUsers": {
-    "dicom": "letmein"
-  },
-  
   "DicomTlsEnabled": false,
   "DicomTlsRemoteCertificateRequired": true,
   "DicomAlwaysAllowEcho": true,
@@ -161,11 +154,6 @@
   "QueryRetrieveSize": 100,
   "CaseSensitivePN": false,
   "LoadPrivateDictionary": true,
-  "Dictionary" : {
-    "0011,1060" : [ "LO", "InnowaveUploaderID", 1, 1, "InowavePrivateGroup"],
-    "1971,0010" : [ "CS", "PBSender", 1, 1, "PixelBridge"],
-    "1971,1001" : [ "LO", "DicomSenderID", 1, 1, "PixelBridge"]
-  },
   "SynchronousCMove": true,
   "JobsHistorySize": 10,
   "SaveJobs": true,
@@ -175,7 +163,7 @@
   "MetricsEnabled": true,
   "ExecuteLuaEnabled": false,
   "HttpRequestTimeout": 30,
-  "DefaultPrivateCreator": "PixelBridge",
+  "DefaultPrivateCreator": "BlackFish",
   "StorageCommitmentReportsSize": 100,
   "TranscodeDicomProtocol": true,
   "BuiltinDecoderTranscoderOrder": "After",
@@ -194,50 +182,5 @@
   "Warnings": {
     "W001_TagsBeingReadFromStorage": true,
     "W002_InconsistentDicomTagsInDb": true
-  },
-  
-  "StoneWebViewer": {
-    "PrintEnabled": false,
-    "DownloadAsJpegEnabled": false,
-    "DownloadStudyEnabled": false,
-    "DownloadDicomDir": false,
-    "InstitutionLogo": "",
-    "ShowInfoPanelAtStartup": "Never",
-    "ShowUserPreferencesButton": true,
-    "ShowNotForDiagnosticUsageDisclaimer": false
-  },
-  
-  "DicomWeb": {
-    "Enable": true,
-    "Root": "/dicom-web/",
-    "PublicRoot": "/dicom-web/",
-    "EnableWado": true,
-    "WadoRoot": "/wado",
-    "Ssl": false,
-    "Servers": {
-      "main": [
-        "http://pacs.mylabctg.com:8042/dicom-web/"
-      ]
-    },
-    "QidoCaseSensitive": true,
-    "MetadataWorkerThreadsCount": 10,
-    "EnableMetadataCache": true,
-    "StudiesMetadata": "Full",
-    "SeriesMetadata": "Full"
-  },
-  
-  "OrthancExplorer2": {
-    "Enable": true,
-    "IsDefaultOrthancUI": true
-  },
-  
-  "PostgreSQL": {
-    "EnableIndex": true,
-    "EnableStorage": false,
-    "Host": "postgres",
-    "Port": 5432,
-    "Database": "orthanc",
-    "Username": "postgres", 
-    "Password": "password"
   }
 }
\ No newline at end of file
diff --git a/config/orthanc/postgresql.json b/config/orthanc/postgresql.json
new file mode 100644
index 0000000..0a46342
--- /dev/null
+++ b/config/orthanc/postgresql.json
@@ -0,0 +1,11 @@
+{
+ "PostgreSQL": {
+    "EnableIndex": true,
+    "EnableStorage": false,
+    "Host": "postgres",
+    "Port": 5432,
+    "Database": "orthanc",
+    "Username": "postgres", 
+    "Password": "password"
+  }
+}
\ No newline at end of file
diff --git a/config/orthanc/registered-users.json b/config/orthanc/registered-users.json
new file mode 100644
index 0000000..6cddc9e
--- /dev/null
+++ b/config/orthanc/registered-users.json
@@ -0,0 +1,6 @@
+{
+  "AuthenticationEnabled": false,
+  "RegisteredUsers": {
+    "blackfish": "letmein"
+  }
+}
\ No newline at end of file
diff --git a/config/orthanc/stone.json b/config/orthanc/stone.json
new file mode 100644
index 0000000..b3a1741
--- /dev/null
+++ b/config/orthanc/stone.json
@@ -0,0 +1,12 @@
+{
+  "StoneWebViewer": {
+    "PrintEnabled": false,
+    "DownloadAsJpegEnabled": false,
+    "DownloadStudyEnabled": false,
+    "DownloadDicomDir": false,
+    "InstitutionLogo": "",
+    "ShowInfoPanelAtStartup": "Never",
+    "ShowUserPreferencesButton": true,
+    "ShowNotForDiagnosticUsageDisclaimer": false
+  }
+}
\ No newline at end of file