diff --git a/.gitmodules b/.gitmodules
index d76ecd289..3f6396c08 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,18 +1,18 @@
 [submodule "roles/k8s-common"]
-    path = roles/k8s-common
+    path = roles/apps/k8s-common
     url = https://github.com/ansibl8s/k8s-common.git
 [submodule "roles/k8s-fabric8"]
-    path = roles/k8s-fabric8
+    path = roles/apps/k8s-fabric8
     url = https://github.com/ansibl8s/k8s-fabric8.git
 [submodule "roles/k8s-kube-ui"]
-    path = roles/k8s-kube-ui
+    path = roles/apps/k8s-kube-ui
     url = https://github.com/ansibl8s/k8s-kube-ui.git
     branch = v1.0
 [submodule "roles/k8s-skydns"]
-    path = roles/k8s-skydns
+    path = roles/apps/k8s-skydns
     url = https://github.com/ansibl8s/k8s-skydns.git
     branch = v1.0
 [submodule "roles/k8s-postgres"]
-    path = roles/k8s-postgres
+    path = roles/apps/k8s-postgres
     url = https://github.com/ansibl8s/k8s-postgres.git
     branch = v1.0
diff --git a/README.md b/README.md
index eeceaaf25..da355117c 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,7 @@ grep path .gitmodules | sed 's/.*= //'
 For instance if you will probably want to install a [dns server](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/dns) as it is **strongly recommanded**.
 In order to use this role you'll need to follow these steps
 ```
-git submodule init roles/k8s-skydns
+git submodule init roles/apps/k8s-skydns
 git submodule update
 ```
 Then update your playbook with the chosen role
@@ -131,7 +131,7 @@ Then update your playbook with the chosen role
 - hosts: kube-master
   roles:
     - { role: kubernetes/master, tags: master }
-    - { role: k8s-skydns, tags: skydns }
+    - { role: apps/k8s-skydns, tags: skydns }
 ...
 ```
 Please refer to the [k8s-skydns readme](https://github.com/ansibl8s/k8s-skydns) for additionnal info.
@@ -171,12 +171,7 @@ This issue will be fixed when kubernetes 1.1 will be released as described in th
 ### Monitoring addon
 Until now i didn't managed to get the monitoring addon working.
 
-### Listen on secure port only
+### Apiserver listen on secure port only
 Currently the api-server listens on both secure and insecure ports.
 The insecure port is mainly used for calico.
 Will be fixed soon.
-
-Author Information
-------------------
-
-Smana - Smaine Kahlouch (smainklh@gmail.com)
diff --git a/roles/k8s-common b/roles/apps/k8s-common
similarity index 100%
rename from roles/k8s-common
rename to roles/apps/k8s-common
diff --git a/roles/k8s-fabric8 b/roles/apps/k8s-fabric8
similarity index 100%
rename from roles/k8s-fabric8
rename to roles/apps/k8s-fabric8
diff --git a/roles/k8s-kube-ui b/roles/apps/k8s-kube-ui
similarity index 100%
rename from roles/k8s-kube-ui
rename to roles/apps/k8s-kube-ui
diff --git a/roles/k8s-postgres b/roles/apps/k8s-postgres
similarity index 100%
rename from roles/k8s-postgres
rename to roles/apps/k8s-postgres
diff --git a/roles/k8s-skydns b/roles/apps/k8s-skydns
similarity index 100%
rename from roles/k8s-skydns
rename to roles/apps/k8s-skydns