diff --git a/roles/cfssl-server/defaults/main.yml b/cfssl-server/defaults/main.yml
similarity index 100%
rename from roles/cfssl-server/defaults/main.yml
rename to cfssl-server/defaults/main.yml
diff --git a/roles/cfssl-server/handlers/main.yml b/cfssl-server/handlers/main.yml
similarity index 100%
rename from roles/cfssl-server/handlers/main.yml
rename to cfssl-server/handlers/main.yml
diff --git a/roles/cfssl-server/tasks/main.yml b/cfssl-server/tasks/main.yml
similarity index 100%
rename from roles/cfssl-server/tasks/main.yml
rename to cfssl-server/tasks/main.yml
diff --git a/roles/cfssl-server/tasks/pre_requisite.yml b/cfssl-server/tasks/pre_requisite.yml
similarity index 100%
rename from roles/cfssl-server/tasks/pre_requisite.yml
rename to cfssl-server/tasks/pre_requisite.yml
diff --git a/roles/cfssl-server/templates/cfssl.json.j2 b/cfssl-server/templates/cfssl.json.j2
similarity index 100%
rename from roles/cfssl-server/templates/cfssl.json.j2
rename to cfssl-server/templates/cfssl.json.j2
diff --git a/roles/cfssl-server/templates/cfssl.service.j2 b/cfssl-server/templates/cfssl.service.j2
similarity index 100%
rename from roles/cfssl-server/templates/cfssl.service.j2
rename to cfssl-server/templates/cfssl.service.j2
diff --git a/roles/cfssl-server/templates/csr_ROOT_CA.json.j2 b/cfssl-server/templates/csr_ROOT_CA.json.j2
similarity index 100%
rename from roles/cfssl-server/templates/csr_ROOT_CA.json.j2
rename to cfssl-server/templates/csr_ROOT_CA.json.j2
diff --git a/roles/cfssl-server/templates/csr_intermediate_CA.json.j2 b/cfssl-server/templates/csr_intermediate_CA.json.j2
similarity index 100%
rename from roles/cfssl-server/templates/csr_intermediate_CA.json.j2
rename to cfssl-server/templates/csr_intermediate_CA.json.j2
diff --git a/roles/cfssl-server/templates/db.json.j2 b/cfssl-server/templates/db.json.j2
similarity index 100%
rename from roles/cfssl-server/templates/db.json.j2
rename to cfssl-server/templates/db.json.j2
diff --git a/roles/cfssl-server/templates/init.sql.j2 b/cfssl-server/templates/init.sql.j2
similarity index 100%
rename from roles/cfssl-server/templates/init.sql.j2
rename to cfssl-server/templates/init.sql.j2
diff --git a/roles/cfssl-server/templates/csr.json.j2 b/roles/cfssl-server/templates/csr.json.j2
deleted file mode 100644
index 2419c3b..0000000
--- a/roles/cfssl-server/templates/csr.json.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "CN": {{item.cname | to_json}},
-    "hosts": {{ (item.sans|default([]) + item.altips|default([]) + item.cname.split(',')) | to_json}},
-    "key" : {{item.key | default(pki_key) | to_json}},
-    "names" : {{item.names | default(pki_names) | to_json}}
-}