diff --git a/Apps_for_DS/01-Conf_license_slave/default/server.conf b/Apps_for_DS/01-Conf_license_slave/default/server.conf
index 4d7d5d9..0fbe02e 100755
--- a/Apps_for_DS/01-Conf_license_slave/default/server.conf
+++ b/Apps_for_DS/01-Conf_license_slave/default/server.conf
@@ -6,4 +6,4 @@
         # the indexers. In either event, the settings are the same.
 
         [license]
-        master_uri = https://SVLCTMLOGCLM01.unit-c.edf.fr:8089
\ No newline at end of file
+        master_uri = https://SRVLM01.jpit.com:8089
\ No newline at end of file
diff --git a/Apps_for_DS/02-M-TIC_all_forwarding_outputs/default/outputs.conf b/Apps_for_DS/02-M-TIC_all_forwarding_outputs/default/outputs.conf
deleted file mode 100755
index 72ef901..0000000
--- a/Apps_for_DS/02-M-TIC_all_forwarding_outputs/default/outputs.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# BASE SETTINGS
-
-[tcpout]
-# Change here to specify the indexer group
-defaultGroup = m-tic_indexer
-maxQueueSize = 7MB
-useACK = true
-forceTimebasedAutoLB = true
-
-[tcpout:m-tic_indexer]
-server =  SVLCTMLOGIDX01.unit-c.edf.fr:9997, SVLCTMLOGIDX02.unit-c.edf.fr:9997
-~
diff --git a/Apps_for_DS/For_MC/local/distsearch.conf b/Apps_for_DS/For_MC/local/distsearch.conf
index 4e59289..8ed6925 100755
--- a/Apps_for_DS/For_MC/local/distsearch.conf
+++ b/Apps_for_DS/For_MC/local/distsearch.conf
@@ -1,14 +1,14 @@
 [distributedSearch]
-servers = https://SVLCTMLOGCLM01.unit-c.edf.fr:8089,https://SVLCTMLOGPUB01.unit-c.edf.fr:8089,https://SVLCTMLOGPUB02.unit-c.edf.fr:8089
+servers = https://SPLCLM01.jpit.com:8089,https://SPLSH01.jpit.com:8089,https://SPLSH02.jpit.com:8089
 
 [distributedSearch:dmc_group_deployment_server]
 servers = localhost:localhost
 
 [distributedSearch:dmc_group_kv_store]
-servers = SVLCTMLOGCLM01.unit-c.edf.fr:8089,SVLCTMLOGPUB01.unit-c.edf.fr:8089,SVLCTMLOGPUB02.unit-c.edf.fr:8089
+servers = SPLCLM01.jpit.com:8089,SPLSH01.jpit.com:8089,SPLSH02.jpit.com:8089
 
 [distributedSearch:dmc_group_license_master]
-servers = SVLCTMLOGCLM01.unit-c.edf.fr:8089
+servers = SPLCLM01.jpit.com:8089
 
 [distributedSearch:dmc_group_shc_deployer]
 servers = localhost:localhost
@@ -18,10 +18,10 @@ servers = SVLCTMLOGCLM01.unit-c.edf.fr:8089
 
 [distributedSearch:dmc_group_indexer]
 default = true
-servers = SVLCTMLOGIDX01.unit-c.edf.fr:8089,SVLCTMLOGIDX02.unit-c.edf.fr:8089
+servers = SPLIDX01.jpit.com:8089,SPLIDX02.jpit.com:8089
 
 [distributedSearch:dmc_group_search_head]
-servers = SVLCTMLOGCLM01.unit-c.edf.fr:8089,SVLCTMLOGPUB01.unit-c.edf.fr:8089,SVLCTMLOGPUB02.unit-c.edf.fr:8089
+servers = SSPLCLM01.jpit.com:8089,SPLSH01.jpit.com:8089,SPLSH02.jpit.com:8089
 
 [distributedSearch:dmc_searchheadclustergroup_Cluster_SH_M-TIC]
-servers = localhost:localhost,SVLCTMLOGPUB01.unit-c.edf.fr:8089,SVLCTMLOGPUB02.unit-c.edf.fr:8089
+servers = localhost:localhost,SPLSH01.jpit.com:8089,SPLSH02.jpit.com:8089
diff --git a/Apps_for_DS/02-M-TIC_all_forwarding_outputs/default/app.conf b/Apps_for_DS/all_forwarding_outputs/default/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_all_forwarding_outputs/default/app.conf
rename to Apps_for_DS/all_forwarding_outputs/default/app.conf
diff --git a/Apps_for_DS/all_forwarding_outputs/default/outputs.conf b/Apps_for_DS/all_forwarding_outputs/default/outputs.conf
new file mode 100755
index 0000000..86e498a
--- /dev/null
+++ b/Apps_for_DS/all_forwarding_outputs/default/outputs.conf
@@ -0,0 +1,11 @@
+# BASE SETTINGS
+
+[tcpout]
+# Change here to specify the indexer group
+defaultGroup = indexer
+maxQueueSize = 7MB
+useACK = true
+forceTimebasedAutoLB = true
+
+[tcpout:indexer]
+server =  SPLIDX01.jpit.com:9997, SPLIDX02.jpit.com:9997
diff --git a/Apps_for_DS/02-M-TIC_all_forwarding_outputs/local/app.conf b/Apps_for_DS/all_forwarding_outputs/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_all_forwarding_outputs/local/app.conf
rename to Apps_for_DS/all_forwarding_outputs/local/app.conf
diff --git a/Apps_for_DS/02-M-TIC_catchall_forwarders_inputs/local/app.conf b/Apps_for_DS/catchall_forwarders_inputs/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_catchall_forwarders_inputs/local/app.conf
rename to Apps_for_DS/catchall_forwarders_inputs/local/app.conf
diff --git a/Apps_for_DS/02-M-TIC_catchall_forwarders_inputs/local/inputs.conf b/Apps_for_DS/catchall_forwarders_inputs/local/inputs.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_catchall_forwarders_inputs/local/inputs.conf
rename to Apps_for_DS/catchall_forwarders_inputs/local/inputs.conf
diff --git a/Apps_for_DS/02-M-TIC_catchall_forwarders_inputs/metadata/local.meta b/Apps_for_DS/catchall_forwarders_inputs/metadata/local.meta
similarity index 100%
rename from Apps_for_DS/02-M-TIC_catchall_forwarders_inputs/metadata/local.meta
rename to Apps_for_DS/catchall_forwarders_inputs/metadata/local.meta
diff --git a/Apps_for_DS/02-M-TIC_cisco_forwarders_inputs/local/app.conf b/Apps_for_DS/cisco_forwarders_inputs/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_cisco_forwarders_inputs/local/app.conf
rename to Apps_for_DS/cisco_forwarders_inputs/local/app.conf
diff --git a/Apps_for_DS/02-M-TIC_cisco_forwarders_inputs/local/inputs.conf b/Apps_for_DS/cisco_forwarders_inputs/local/inputs.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_cisco_forwarders_inputs/local/inputs.conf
rename to Apps_for_DS/cisco_forwarders_inputs/local/inputs.conf
diff --git a/Apps_for_DS/02-M-TIC_cisco_forwarders_inputs/metadata/local.meta b/Apps_for_DS/cisco_forwarders_inputs/metadata/local.meta
similarity index 100%
rename from Apps_for_DS/02-M-TIC_cisco_forwarders_inputs/metadata/local.meta
rename to Apps_for_DS/cisco_forwarders_inputs/metadata/local.meta
diff --git a/Apps_for_DS/02-M-TIC_cluster_forwarder_outputs/local/app.conf b/Apps_for_DS/cluster_forwarder_outputs/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_cluster_forwarder_outputs/local/app.conf
rename to Apps_for_DS/cluster_forwarder_outputs/local/app.conf
diff --git a/Apps_for_DS/02-M-TIC_cluster_forwarder_outputs/local/outputs.conf b/Apps_for_DS/cluster_forwarder_outputs/local/outputs.conf
similarity index 73%
rename from Apps_for_DS/02-M-TIC_cluster_forwarder_outputs/local/outputs.conf
rename to Apps_for_DS/cluster_forwarder_outputs/local/outputs.conf
index 9519b26..52ebf3c 100755
--- a/Apps_for_DS/02-M-TIC_cluster_forwarder_outputs/local/outputs.conf
+++ b/Apps_for_DS/cluster_forwarder_outputs/local/outputs.conf
@@ -6,7 +6,7 @@ forceTimebaseAutoLB = true
 forwardedindex.2.whitelist = (_audit|_introspection|_internal)
 
 [tcpout:primary_indexers]
-server = SVLCTMLOGIDX01.unit-c.edf.fr:9997, SVLCTMLOGIDX02.unit-c.edf.fr:9997
+server = SPLIDX01.jpit.com:9997, SPLIDX02.jpit.com:9997
 
 #clientCert = $SPLUNK_HOME/etc/auth/server.pem
 #sslPassword = 
diff --git a/Apps_for_DS/02-M-TIC_cluster_forwarder_outputs/local/server.conf b/Apps_for_DS/cluster_forwarder_outputs/local/server.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_cluster_forwarder_outputs/local/server.conf
rename to Apps_for_DS/cluster_forwarder_outputs/local/server.conf
diff --git a/Apps_for_DS/02-M-TIC_deployer_base/local/app.conf b/Apps_for_DS/deployer_base/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_deployer_base/local/app.conf
rename to Apps_for_DS/deployer_base/local/app.conf
diff --git a/Apps_for_DS/02-M-TIC_deployer_base/local/server.conf b/Apps_for_DS/deployer_base/local/server.conf
similarity index 77%
rename from Apps_for_DS/02-M-TIC_deployer_base/local/server.conf
rename to Apps_for_DS/deployer_base/local/server.conf
index b3abc83..3278e5a 100755
--- a/Apps_for_DS/02-M-TIC_deployer_base/local/server.conf
+++ b/Apps_for_DS/deployer_base/local/server.conf
@@ -1,3 +1,3 @@
 [shclustering]
 pass4SymmKey = $7$iQ3wl+w1tMlCZXopQ/BDXHv8e+xGXGR10mvQYOiCdPxZuIkKX87oMm85MSkitkPk3PYW2Qhjc/kSMq2B5M0=
-shcluster_label = M-TIC_shcluster
\ No newline at end of file
+shcluster_label = shcluster
\ No newline at end of file
diff --git a/Apps_for_DS/02-M-TIC_esxi_forwarders_inputs/local/app.conf b/Apps_for_DS/esxi_forwarders_inputs/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_esxi_forwarders_inputs/local/app.conf
rename to Apps_for_DS/esxi_forwarders_inputs/local/app.conf
diff --git a/Apps_for_DS/02-M-TIC_esxi_forwarders_inputs/local/inputs.conf b/Apps_for_DS/esxi_forwarders_inputs/local/inputs.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_esxi_forwarders_inputs/local/inputs.conf
rename to Apps_for_DS/esxi_forwarders_inputs/local/inputs.conf
diff --git a/Apps_for_DS/02-M-TIC_esxi_forwarders_inputs/metadata/local.meta b/Apps_for_DS/esxi_forwarders_inputs/metadata/local.meta
similarity index 100%
rename from Apps_for_DS/02-M-TIC_esxi_forwarders_inputs/metadata/local.meta
rename to Apps_for_DS/esxi_forwarders_inputs/metadata/local.meta
diff --git a/Apps_for_DS/02-M-TIC_fortigate_forwarders_inputs/local/app.conf b/Apps_for_DS/fortigate_forwarders_inputs/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_fortigate_forwarders_inputs/local/app.conf
rename to Apps_for_DS/fortigate_forwarders_inputs/local/app.conf
diff --git a/Apps_for_DS/02-M-TIC_fortigate_forwarders_inputs/local/inputs.conf b/Apps_for_DS/fortigate_forwarders_inputs/local/inputs.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_fortigate_forwarders_inputs/local/inputs.conf
rename to Apps_for_DS/fortigate_forwarders_inputs/local/inputs.conf
diff --git a/Apps_for_DS/02-M-TIC_fortigate_forwarders_inputs/metadata/local.meta b/Apps_for_DS/fortigate_forwarders_inputs/metadata/local.meta
similarity index 100%
rename from Apps_for_DS/02-M-TIC_fortigate_forwarders_inputs/metadata/local.meta
rename to Apps_for_DS/fortigate_forwarders_inputs/metadata/local.meta
diff --git a/Apps_for_DS/02-M-TIC_idx_indexes_base/default/app.conf b/Apps_for_DS/idx_indexes_base/default/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_idx_indexes_base/default/app.conf
rename to Apps_for_DS/idx_indexes_base/default/app.conf
diff --git a/Apps_for_DS/02-M-TIC_idx_indexes_base/default/indexes.conf b/Apps_for_DS/idx_indexes_base/default/indexes.conf
similarity index 61%
rename from Apps_for_DS/02-M-TIC_idx_indexes_base/default/indexes.conf
rename to Apps_for_DS/idx_indexes_base/default/indexes.conf
index ba562f9..9dc1f57 100755
--- a/Apps_for_DS/02-M-TIC_idx_indexes_base/default/indexes.conf
+++ b/Apps_for_DS/idx_indexes_base/default/indexes.conf
@@ -17,13 +17,13 @@ selfStorageThreads =
 suspendHotRollByDeleteQuery = 0
 syncMeta = 1
 
-[idx_m-tic_windows]
+[idx_windows]
 
-[idx_m-tic_fortigate]
+[idx_fortigate]
 
-[idx_m-tic_linux]
+[idx_linux]
 
-[idx_m-tic_esxi]
+[idx_esxi]
 
 [vmware-esxilog]
 
@@ -36,30 +36,30 @@ datatype = metric
 
 [vmware-vclog]
 
-[idx_m-tic_alcatel]
+[idx_alcatel]
 
-[idx_m-tic_cisco]
+[idx_cisco]
 
-[idx_m-tic_switch]
+[idx_switch]
 
-[idx_m-tic_catchall]
+[idx_catchall]
 
-[idx_m-tic_catchother]
+[idx_catchother]
 
-[idx_m-tic_other]
+[idx_other]
 
-[idx_m-tic_glpi]
+[idx_glpi]
 
-[idx_m-tic_glpi_vm]
+[idx_glpi_vm]
 
-[idx_m-tic_glpi_kb]
+[idx_glpi_kb]
 
-[idx_m-tic_glpi_sep]
+[idx_glpi_sep]
 
-[idx_m-tic_glpi_obsolescence]
+[idx_glpi_obsolescence]
 
-[idx_m-tic_genetec_sc]
+[idx_genetec_sc]
 
 [idx_ldap]
 
-[idx_m-tic_synology]
\ No newline at end of file
+[idx_synology]
\ No newline at end of file
diff --git a/Apps_for_DS/02-M-TIC_cluster_master_base/local/app.conf b/Apps_for_DS/idx_indexes_base/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_cluster_master_base/local/app.conf
rename to Apps_for_DS/idx_indexes_base/local/app.conf
diff --git a/Apps_for_DS/02-M-TIC_linux_forwarders_inputs/local/app.conf b/Apps_for_DS/linux_forwarders_inputs/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_linux_forwarders_inputs/local/app.conf
rename to Apps_for_DS/linux_forwarders_inputs/local/app.conf
diff --git a/Apps_for_DS/02-M-TIC_linux_forwarders_inputs/local/inputs.conf b/Apps_for_DS/linux_forwarders_inputs/local/inputs.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_linux_forwarders_inputs/local/inputs.conf
rename to Apps_for_DS/linux_forwarders_inputs/local/inputs.conf
diff --git a/Apps_for_DS/02-M-TIC_linux_forwarders_inputs/metadata/local.meta b/Apps_for_DS/linux_forwarders_inputs/metadata/local.meta
similarity index 100%
rename from Apps_for_DS/02-M-TIC_linux_forwarders_inputs/metadata/local.meta
rename to Apps_for_DS/linux_forwarders_inputs/metadata/local.meta
diff --git a/Apps_for_DS/02-M-TIC_sh_cluster_base/default/app.conf b/Apps_for_DS/sh_cluster_base/default/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_sh_cluster_base/default/app.conf
rename to Apps_for_DS/sh_cluster_base/default/app.conf
diff --git a/Apps_for_DS/02-M-TIC_sh_cluster_base/default/authorize.conf b/Apps_for_DS/sh_cluster_base/default/authorize.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_sh_cluster_base/default/authorize.conf
rename to Apps_for_DS/sh_cluster_base/default/authorize.conf
diff --git a/Apps_for_DS/02-M-TIC_sh_cluster_base/default/fields.conf b/Apps_for_DS/sh_cluster_base/default/fields.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_sh_cluster_base/default/fields.conf
rename to Apps_for_DS/sh_cluster_base/default/fields.conf
diff --git a/Apps_for_DS/02-M-TIC_sh_cluster_base/default/server.conf b/Apps_for_DS/sh_cluster_base/default/server.conf
similarity index 63%
rename from Apps_for_DS/02-M-TIC_sh_cluster_base/default/server.conf
rename to Apps_for_DS/sh_cluster_base/default/server.conf
index 7c50fab..ec784ad 100755
--- a/Apps_for_DS/02-M-TIC_sh_cluster_base/default/server.conf
+++ b/Apps_for_DS/sh_cluster_base/default/server.conf
@@ -3,13 +3,13 @@ mode = searchhead
 manager_uri = clustermanager:one
 
 [clustermanager:one]
-manager_uri = https://SVLCTMLOGCLM01.unit-c.edf.fr:8089
+manager_uri = https://SPLCLM01.jpit.com:8089
 pass4SymmKey = $7$S9wq9h/bAbFgNYLo/9vsjHEwpY2z8IkPYQ663LGXb6cLu5YmhyEQnSS3+7jNTRzFBQ==
 multisite = false
 
 [shclustering]
-shcluster_label = M-TIC_shcluster
-conf_deploy_fetch_url = https://SVLCTMLOGSUP01.unit-c.edf.fr:8089
+shcluster_label = shcluster
+conf_deploy_fetch_url = https://SPLDSMC.jpit.com:8089
 pass4SymmKey = $7$S9wq9h/bAbFgNYLo/9vsjHEwpY2z8IkPYQ663LGXb6cLu5YmhyEQnSS3+7jNTRzFBQ==
 
 [httpServer]
diff --git a/Apps_for_DS/02-M-TIC_sh_cluster_base/metadata/default.meta b/Apps_for_DS/sh_cluster_base/metadata/default.meta
similarity index 100%
rename from Apps_for_DS/02-M-TIC_sh_cluster_base/metadata/default.meta
rename to Apps_for_DS/sh_cluster_base/metadata/default.meta
diff --git a/Apps_for_DS/02-M-TIC_sh_idxcluster_base/default/app.conf b/Apps_for_DS/sh_idxcluster_base/default/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_sh_idxcluster_base/default/app.conf
rename to Apps_for_DS/sh_idxcluster_base/default/app.conf
diff --git a/Apps_for_DS/02-M-TIC_sh_idxcluster_base/default/server.conf b/Apps_for_DS/sh_idxcluster_base/default/server.conf
similarity index 70%
rename from Apps_for_DS/02-M-TIC_sh_idxcluster_base/default/server.conf
rename to Apps_for_DS/sh_idxcluster_base/default/server.conf
index bf71fc9..73f7402 100755
--- a/Apps_for_DS/02-M-TIC_sh_idxcluster_base/default/server.conf
+++ b/Apps_for_DS/sh_idxcluster_base/default/server.conf
@@ -3,7 +3,7 @@ site = site2
 
 [clustering]
 multisite = true
-master_uri = https://SVLCTMLOGCLM01.unit-c.edf.fr:8089
+master_uri = https://SPLCLM01.jpit.com:8089
 mode = searchhead
 pass4SymmKey = $7$i7IqoiyC1DpnVbSVtwGzuVTO5rmVyPCI2CMacpHEFs3N2oFAaF0EJ049Otza
 
diff --git a/Apps_for_DS/02-M-TIC_idx_cluster_base/local/app.conf b/Apps_for_DS/sh_idxcluster_base/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_idx_cluster_base/local/app.conf
rename to Apps_for_DS/sh_idxcluster_base/local/app.conf
diff --git a/Apps_for_DS/02-M-TIC_sh_volume_indexes/default/app.conf b/Apps_for_DS/sh_volume_indexes/default/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_sh_volume_indexes/default/app.conf
rename to Apps_for_DS/sh_volume_indexes/default/app.conf
diff --git a/Apps_for_DS/02-M-TIC_sh_volume_indexes/default/indexes.conf b/Apps_for_DS/sh_volume_indexes/default/indexes.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_sh_volume_indexes/default/indexes.conf
rename to Apps_for_DS/sh_volume_indexes/default/indexes.conf
diff --git a/Apps_for_DS/splunk_monitoring_console/local/splunk_monitoring_console_assets.conf b/Apps_for_DS/splunk_monitoring_console/local/splunk_monitoring_console_assets.conf
index 81e890b..db83a27 100755
--- a/Apps_for_DS/splunk_monitoring_console/local/splunk_monitoring_console_assets.conf
+++ b/Apps_for_DS/splunk_monitoring_console/local/splunk_monitoring_console_assets.conf
@@ -1,3 +1,3 @@
 [settings]
 disabled = 0
-configuredPeers = SVLCTMLOGPUB01.unit-c.edf.fr:8089,SVLCTMLOGPUB02.unit-c.edf.fr:8089,SVLCTMLOGIDX01.unit-c.edf.fr:8089,SVLCTMLOGIDX02.unit-c.edf.fr:8089,SVLCTMLOGCLM01.unit-c.edf.fr:8089,SVLCTMLOGCLM01.unit-c.edf.fr:8089
\ No newline at end of file
+configuredPeers = SPLSH01.jpit.com:8089,SPLSH02.jpit.com:8089,SPLIDX01.jpit.com:8089,SPLIDX02.jpit.com:8089,SPLCLM01.jpit.com:8089
\ No newline at end of file
diff --git a/Apps_for_DS/02-M-TIC_windows_forwarders_inputs/local/app.conf b/Apps_for_DS/windows_forwarders_inputs/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_windows_forwarders_inputs/local/app.conf
rename to Apps_for_DS/windows_forwarders_inputs/local/app.conf
diff --git a/Apps_for_DS/02-M-TIC_windows_forwarders_inputs/local/inputs.conf b/Apps_for_DS/windows_forwarders_inputs/local/inputs.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_windows_forwarders_inputs/local/inputs.conf
rename to Apps_for_DS/windows_forwarders_inputs/local/inputs.conf
diff --git a/Apps_for_DS/02-M-TIC_windows_forwarders_inputs/metadata/local.meta b/Apps_for_DS/windows_forwarders_inputs/metadata/local.meta
similarity index 100%
rename from Apps_for_DS/02-M-TIC_windows_forwarders_inputs/metadata/local.meta
rename to Apps_for_DS/windows_forwarders_inputs/metadata/local.meta
diff --git a/Apps_for_Splunk/01-Conf_ServerClass/local/serverclass.conf b/Apps_for_Splunk/01-Conf_ServerClass/local/serverclass.conf
index ebd3905..b2fb920 100755
--- a/Apps_for_Splunk/01-Conf_ServerClass/local/serverclass.conf
+++ b/Apps_for_Splunk/01-Conf_ServerClass/local/serverclass.conf
@@ -14,22 +14,12 @@ endpoint = $deploymentServerUri$/services/streams/deployment?name=$tenantName$:$
 
 filterType = whitelist
 
-[serverClass:Licence_Master_TIC]
+[serverClass:Licence_Master]
 
-[serverClass:Cluster_Master_TIC]
+[serverClass:Cluster_Master]
 
 [serverClass:Cluster_Indexer_TIC]
 
-[serverClass:Cluster_SH_TIC]
+[serverClass:Forwarder_Linux]
 
-[serverClass:Forwarder_Linux_TIC]
-
-[serverClass:Forwarder_Windows_TIC]
-
-[serverClass:Cluster_Master_TIH]
-
-[serverClass:Cluster_Indexer_TIH]
-
-[serverClass:Forwarder_Linux_TIH]
-
-[serverClass:Forwarder_Windows_TIH]
\ No newline at end of file
+[serverClass:Forwarder_Windows]
\ No newline at end of file
diff --git a/Apps_for_Splunk/01-Conf_deploy_client/local/deploymentclient.conf b/Apps_for_Splunk/01-Conf_deploy_client/local/deploymentclient.conf
index 026a07a..0fb7731 100755
--- a/Apps_for_Splunk/01-Conf_deploy_client/local/deploymentclient.conf
+++ b/Apps_for_Splunk/01-Conf_deploy_client/local/deploymentclient.conf
@@ -1,5 +1,7 @@
 [target-broker:deploymentServer]
-targetUri = https://SVLCTMLOGSUP01.unit-c.edf.fr:8089
+targetUri = https://SPLDSMC.jpit.com:8089
 
 [deployment-client]
+repositoryLocation = $SPLUNK_HOME/etc/manager-apps
+serverRepositoryLocationPolicy = rejectAlways
 disabled = 0
\ No newline at end of file
diff --git a/Apps_for_DS/02-M-TIC_cluster_master_base/default/app.conf b/Apps_for_Splunk/cluster_master_base/default/app.conf
similarity index 73%
rename from Apps_for_DS/02-M-TIC_cluster_master_base/default/app.conf
rename to Apps_for_Splunk/cluster_master_base/default/app.conf
index 1c4bb3d..d96cabb 100755
--- a/Apps_for_DS/02-M-TIC_cluster_master_base/default/app.conf
+++ b/Apps_for_Splunk/cluster_master_base/default/app.conf
@@ -4,7 +4,7 @@ author =  VABOS
 description = Configure Cluster Master
 
 [package]
-id = M-TIC_cluster_master_base
+id = cluster_master_base
 
 
 [ui]
diff --git a/Apps_for_DS/02-M-TIC_cluster_master_base/default/distsearch.conf b/Apps_for_Splunk/cluster_master_base/default/distsearch.conf
similarity index 58%
rename from Apps_for_DS/02-M-TIC_cluster_master_base/default/distsearch.conf
rename to Apps_for_Splunk/cluster_master_base/default/distsearch.conf
index 4342194..ecf7ea6 100755
--- a/Apps_for_DS/02-M-TIC_cluster_master_base/default/distsearch.conf
+++ b/Apps_for_Splunk/cluster_master_base/default/distsearch.conf
@@ -9,11 +9,11 @@ servers = localhost:localhost
 
 [distributedSearch:dmc_group_indexer]
 default = false
-servers = SVLCTMLOGIDX01.unit-c.edf.fr:8089,SVLCTMLOGIDX02.unit-c.edf.fr:8089
+servers = SPLIDX01.jpit.com:8089,SPLIDX02.jpit.com:8089
 
 [distributedSearch:dmc_group_shc_deployer]
 
 [distributedSearch:dmc_group_kv_store]
 
-[distributedSearch:dmc_indexerclustergroup_Cluster_M-TIC]
-servers = localhost:localhost,SVLCTMLOGIDX01.unit-c.edf.fr:8089,SVLCTMLOGIDX02.unit-c.edf.fr:8089
+[distributedSearch:dmc_indexerclustergroup_Cluster_IDX]
+servers = localhost:localhost,SPLIDX01.jpit.com:8089,SPLIDX02.jpit.com:8089
diff --git a/Apps_for_DS/02-M-TIC_cluster_master_base/default/server.conf b/Apps_for_Splunk/cluster_master_base/default/server.conf
similarity index 81%
rename from Apps_for_DS/02-M-TIC_cluster_master_base/default/server.conf
rename to Apps_for_Splunk/cluster_master_base/default/server.conf
index 4ea84ee..80a30aa 100755
--- a/Apps_for_DS/02-M-TIC_cluster_master_base/default/server.conf
+++ b/Apps_for_Splunk/cluster_master_base/default/server.conf
@@ -1,5 +1,5 @@
 [clustering]
-cluster_label = Cluster_M-TIC
+cluster_label = Cluster_IDX
 mode = master
 pass4SymmKey = $7$iQ3wl+w1tMlCZXopQ/BDXHv8e+xGXGR10mvQYOiCdPxZuIkKX87oMm85MSkitkPk3PYW2Qhjc/kSMq2B5M0=
 replication_factor = 2
diff --git a/Apps_for_DS/02-M-TIC_idx_indexes_base/local/app.conf b/Apps_for_Splunk/cluster_master_base/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_idx_indexes_base/local/app.conf
rename to Apps_for_Splunk/cluster_master_base/local/app.conf
diff --git a/Apps_for_DS/02-M-TIC_idx_cluster_base/.DS_Store b/Apps_for_Splunk/idx_cluster_base/.DS_Store
similarity index 100%
rename from Apps_for_DS/02-M-TIC_idx_cluster_base/.DS_Store
rename to Apps_for_Splunk/idx_cluster_base/.DS_Store
diff --git a/Apps_for_DS/02-M-TIC_idx_cluster_base/default/app.conf b/Apps_for_Splunk/idx_cluster_base/default/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_idx_cluster_base/default/app.conf
rename to Apps_for_Splunk/idx_cluster_base/default/app.conf
diff --git a/Apps_for_DS/02-M-TIC_idx_cluster_base/default/fields.conf b/Apps_for_Splunk/idx_cluster_base/default/fields.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_idx_cluster_base/default/fields.conf
rename to Apps_for_Splunk/idx_cluster_base/default/fields.conf
diff --git a/Apps_for_DS/02-M-TIC_idx_cluster_base/default/server.conf b/Apps_for_Splunk/idx_cluster_base/default/server.conf
similarity index 71%
rename from Apps_for_DS/02-M-TIC_idx_cluster_base/default/server.conf
rename to Apps_for_Splunk/idx_cluster_base/default/server.conf
index 6b4974e..702ff9a 100755
--- a/Apps_for_DS/02-M-TIC_idx_cluster_base/default/server.conf
+++ b/Apps_for_Splunk/idx_cluster_base/default/server.conf
@@ -1,6 +1,6 @@
 [replication_port://9100]
 
 [clustering]
-manager_uri = https://SVLCTMLOGCLM01.unit-c.edf.fr:8089
+manager_uri = https://SPLCLM01.jpit.com:8089
 mode = peer
 pass4SymmKey = $7$iQ3wl+w1tMlCZXopQ/BDXHv8e+xGXGR10mvQYOiCdPxZuIkKX87oMm85MSkitkPk3PYW2Qhjc/kSMq2B5M0=
diff --git a/Apps_for_DS/02-M-TIC_sh_idxcluster_base/local/app.conf b/Apps_for_Splunk/idx_cluster_base/local/app.conf
similarity index 100%
rename from Apps_for_DS/02-M-TIC_sh_idxcluster_base/local/app.conf
rename to Apps_for_Splunk/idx_cluster_base/local/app.conf
diff --git a/Deploy_Conf_Splunk.yml b/Deploy_Conf_Splunk.yml
index d5e137e..bb74074 100755
--- a/Deploy_Conf_Splunk.yml
+++ b/Deploy_Conf_Splunk.yml
@@ -1,7 +1,22 @@
 ---
+
+- name: "Deploy Conf for CLM"
+  become: yes
+  hosts:  splunk_cluster_master
+  tasks:
+    - name: "Deploy Conf to Splunk"
+      include_tasks:  roles/splunk_deploy/tasks/Deploy_Conf-to-CLM.yml
+
+- name: "Deploy Conf for IDX"
+  become: yes
+  hosts:  splunk_indexer
+  tasks:
+    - name: "Deploy Conf to Splunk"
+      include_tasks:  roles/splunk_deploy/tasks/Deploy_Conf-to-IDX.yml
+
 - name: "Deploy Conf for Instance Splunk"
   become: yes
-  hosts:  all:!splunk_uf_Linux
+  hosts:  all:!splunk_uf_Linux:!splunk_indexer:!splunk_search_head
   tasks:
     - name: "Deploy Conf to Splunk"
       include_tasks:  roles/splunk_deploy/tasks/Deploy_Conf-to-Splunk.yml
@@ -14,13 +29,13 @@
     - name: Deploy_Conf_DSMC
       include_tasks:  roles/splunk_deploy/tasks/Deploy_Conf_DSMC.yml
 
-#- name: "Deploy Configuration Initial SHC"
-#  become: yes
-#  become_user: "{{ privileged_user }}"
-#  hosts:  splunk_search_head
-#  tasks:
-#    - name: Deploy_Conf_SHC_Init
-#      include_tasks:  roles/splunk_deploy/tasks/Deploy_Conf_SHC_Init.yml
+- name: "Deploy Configuration Initial SHC"
+  become: yes
+  become_user: "{{ privileged_user }}"
+  hosts:  splunk_search_head
+  tasks:
+    - name: Deploy_Conf_SHC_Init
+      include_tasks:  roles/splunk_deploy/tasks/Deploy_Conf_SHC_Init.yml
 
 - name: "Restart de fin d'initialisation Splunk"
   become: yes
@@ -29,13 +44,13 @@
     - name: Restart_SPL
       include_tasks:  roles/splunk_deploy/tasks/Restart_SPL.yml
 
-# - name: "Deploy Configuration Bootstrap SHC"
-#   become: yes
-#   become_user: "{{ privileged_user }}"
-#   hosts:  SVLCTMLOGPUB02.unit-c.edf.fr
-#   tasks:
-#     - name: Deploy_Conf_SHC_BS
-#       include_tasks:  roles/splunk_deploy/tasks/Deploy_Conf_SHC_BS.yml
+- name: "Deploy Configuration Bootstrap SHC"
+  become: yes
+  become_user: "{{ privileged_user }}"
+  hosts:  SPLSH02.jpit.com
+  tasks:
+    - name: Deploy_Conf_SHC_BS
+      include_tasks:  roles/splunk_deploy/tasks/Deploy_Conf_SHC_BS.yml
 
 # - name: "Arrête de fin de deploiement Splunk"
 #  become: yes
diff --git a/roles/splunk_deploy/tasks/Deploy_Conf-to-CLM.yml b/roles/splunk_deploy/tasks/Deploy_Conf-to-CLM.yml
new file mode 100755
index 0000000..3ae7a25
--- /dev/null
+++ b/roles/splunk_deploy/tasks/Deploy_Conf-to-CLM.yml
@@ -0,0 +1,9 @@
+---
+- name: Copier la configuration cluster_master_base dans le CLM
+  become: yes
+  become_user: "{{ privileged_user }}"
+  copy:
+    src: "{{ playbook_dir }}/Apps_for_Splunk/cluster_master_base"
+    dest: /opt/splunk/etc/apps/
+    owner: splunk
+    group: splunk
\ No newline at end of file
diff --git a/roles/splunk_deploy/tasks/Deploy_Conf-to-IDX.yml b/roles/splunk_deploy/tasks/Deploy_Conf-to-IDX.yml
new file mode 100755
index 0000000..4fe4ad6
--- /dev/null
+++ b/roles/splunk_deploy/tasks/Deploy_Conf-to-IDX.yml
@@ -0,0 +1,9 @@
+---
+- name: Copier la configuration cluster_idx_base dans les IDX
+  become: yes
+  become_user: "{{ privileged_user }}"
+  copy:
+    src: "{{ playbook_dir }}/Apps_for_Splunk/idx_cluster_base"
+    dest: /opt/splunk/etc/apps/
+    owner: splunk
+    group: splunk
\ No newline at end of file