diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a5517cd
--- /dev/null
+++ b/README.md
@@ -0,0 +1,39 @@
+K8S Keystone
+=========
+[![Galaxy](https://img.shields.io/badge/galaxy-tripleo.k8s--keystone-blue.svg?style=flat)](https://galaxy.ansible.com/tripleo/k8s-keystone)
+[![Build Status](https://travis-ci.org/tripleo/ansible-role-k8s-keystone.svg?branch=master)](https://travis-ci.org/tripleo/ansible-role-k8s-keystone)
+
+Install Keystone in a Kubernetes cluster.
+
+Requirements
+------------
+
+Access to Kubernetes cluster
+
+Role Variables
+--------------
+
+| Name              | Default Value       | Description          |
+|-------------------|---------------------|----------------------|
+| `action` | `provision` | List of tasks to run. |
+| `core_host` | `https://rhev-i32c-03.mpc.lab.eng.bos.redhat.com:6443` |  |
+| `kube_context` | `kubernetes-admin@kubernetes` |  |
+| `config_file` | `/root/.kube/config` |  |
+
+
+Dependencies
+------------
+
+- `ansible.kubernetes-modules`
+
+Example Playbook
+----------------
+
+    - hosts: all
+      roles:
+         - tripleo.k8s-keystone
+
+License
+-------
+
+MIT
diff --git a/README.rst b/README.rst
deleted file mode 100644
index e69de29..0000000
diff --git a/provision-keystone-apb/defaults/main.yaml b/defaults/main.yml/main.yml
similarity index 100%
rename from provision-keystone-apb/defaults/main.yaml
rename to defaults/main.yml/main.yml
diff --git a/deprovision-keystone-apb/defaults/main.yaml b/deprovision-keystone-apb/defaults/main.yaml
deleted file mode 100644
index 1c83bc1..0000000
--- a/deprovision-keystone-apb/defaults/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-coe_host: "https://rhev-i32c-03.mpc.lab.eng.bos.redhat.com:6443"
-kube_context: "kubernetes-admin@kubernetes"
-config_file: /root/.kube/config
diff --git a/deprovision-keystone-apb/tasks/main.yaml b/tasks/deprovision.yml
similarity index 100%
rename from deprovision-keystone-apb/tasks/main.yaml
rename to tasks/deprovision.yml
diff --git a/provision-keystone-apb/tasks/hiera.yaml b/tasks/hiera.yml
similarity index 100%
rename from provision-keystone-apb/tasks/hiera.yaml
rename to tasks/hiera.yml
diff --git a/tasks/main.yml b/tasks/main.yml
new file mode 100644
index 0000000..ef1ef4f
--- /dev/null
+++ b/tasks/main.yml
@@ -0,0 +1 @@
+- include: "{{ action }}.yml"
diff --git a/provision-keystone-apb/tasks/main.yaml b/tasks/provision.yml
similarity index 97%
rename from provision-keystone-apb/tasks/main.yaml
rename to tasks/provision.yml
index 173dfe2..de52aa5 100644
--- a/provision-keystone-apb/tasks/main.yaml
+++ b/tasks/provision.yml
@@ -9,10 +9,11 @@
   register: create_project
 
 - name: Upload config files
-  template: src="{{item}}"
-            dest="/tmp/{{item}}"
-            backup=yes
-            mode=0644
+  template:
+    src: "{{item}}"
+    dest: /tmp/{{item}}
+    backup: yes
+    mode: 0644
   with_items:
     - httpd.conf
     - httpd-keystone-main.conf
@@ -23,10 +24,10 @@
 
 - name: Generate config files
   config_template:
-    src: 'templates/base.conf.j2'
-    dest: '/tmp/keystone.conf'
+    src: base.conf.j2
+    dest: /tmp/keystone.conf
     config_overrides: '{{keystone_config}}'
-    config_type: 'ini'
+    config_type: ini
 
 - name: Read configs into memory
   slurp:
diff --git a/provision-keystone-apb/templates/base.conf.j2 b/templates/base.conf.j2
similarity index 100%
rename from provision-keystone-apb/templates/base.conf.j2
rename to templates/base.conf.j2
diff --git a/provision-keystone-apb/templates/httpd-keystone-admin.conf b/templates/httpd-keystone-admin.conf
similarity index 100%
rename from provision-keystone-apb/templates/httpd-keystone-admin.conf
rename to templates/httpd-keystone-admin.conf
diff --git a/provision-keystone-apb/templates/httpd-keystone-main.conf b/templates/httpd-keystone-main.conf
similarity index 100%
rename from provision-keystone-apb/templates/httpd-keystone-main.conf
rename to templates/httpd-keystone-main.conf
diff --git a/provision-keystone-apb/templates/httpd.conf b/templates/httpd.conf
similarity index 100%
rename from provision-keystone-apb/templates/httpd.conf
rename to templates/httpd.conf
diff --git a/provision-keystone-apb/templates/keystone-schema.yaml b/templates/keystone-schema.yaml
similarity index 100%
rename from provision-keystone-apb/templates/keystone-schema.yaml
rename to templates/keystone-schema.yaml