diff --git a/README.md b/README.md
index 77d91d0..52a8224 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ This module is to install the MySQL tool called Orchestrator via puppet. Orchest
     'SlaveLagQuery'                              => 'select lag from test.heartbeat_table',
     'DiscoverByShowSlaveHosts'                   => false,
     'DetectClusterAliasQuery'                    => 'select cluster_alias from test.cluster_info_table where 1=1',
-    'DetectClusterDomainQuery'                   => "select cluster_domain from test.cluster_info_table where 1=1',
+    'DetectClusterDomainQuery'                   => 'select cluster_domain from test.cluster_info_table where 1=1',
     'DataCenterPattern'                          => '.*-(.*)-.*[.].*[.]example[.]com',
     'PhysicalEnvironmentPattern'                 => '.*-.*-(.*)[.].*[.]example[.]com',
     'PseudoGTIDPattern'                          => '`heartbeat` (ts, server_id, file, position, relay_master_log_file, exec_master_log_pos) VALUES',
diff --git a/manifests/my_cnf.pp b/manifests/my_cnf.pp
index d9d8c66..8174c71 100644
--- a/manifests/my_cnf.pp
+++ b/manifests/my_cnf.pp
@@ -1,12 +1,13 @@
 #
 class orchestrator::my_cnf inherits orchestrator {
+  $cnf_erb = 'orchestrator/orchestrator.cnf.erb'
 
   file { $orchestrator::topology_cnf:
-    content => template("puppet-orchestrator-for-mysql/${orchestrator::topology_cnf}.erb"),
+    content => template($cnf_erb),
     mode    => '0644',
   }
   file { $orchestrator::srv_cnf:
-    content => template("puppet-orchestrator-for-mysql/${orchestrator::srv_cnf}.erb"),
-    mode   => '0644',
+    content => template($cnf_erb),
+    mode    => '0644',
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index c3031a7..ded9e98 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -10,8 +10,8 @@ class orchestrator::params {
   $service_ensure    = 'running'
   $service_manage    = true
   $service_name      = 'orchestrator'
-  $srv_cnf           = '/etc/mysql/orchestrator_srv.cnf'
-  $topology_cnf      = '/etc/mysql/orchestrator.cnf'
+  $srv_cnf           = '/etc/orchestrator_srv.cnf'
+  $topology_cnf      = '/etc/orchestrator.cnf'
 
   $config_defaults   = {
     'Debug'                                      => true,
diff --git a/templates/etc/mysql/orchestrator.cnf.erb b/templates/orchestrator.cnf.erb
similarity index 100%
rename from templates/etc/mysql/orchestrator.cnf.erb
rename to templates/orchestrator.cnf.erb
diff --git a/templates/etc/mysql/orchestrator.conf.json.erb b/templates/orchestrator.conf.json.erb
similarity index 100%
rename from templates/etc/mysql/orchestrator.conf.json.erb
rename to templates/orchestrator.conf.json.erb