diff --git a/staging/mysql-cinder-pd/README.md b/mysql-cinder-pd/README.md
similarity index 100%
rename from staging/mysql-cinder-pd/README.md
rename to mysql-cinder-pd/README.md
diff --git a/staging/mysql-cinder-pd/mysql-service.yaml b/mysql-cinder-pd/mysql-service.yaml
similarity index 100%
rename from staging/mysql-cinder-pd/mysql-service.yaml
rename to mysql-cinder-pd/mysql-service.yaml
diff --git a/staging/mysql-cinder-pd/mysql.yaml b/mysql-cinder-pd/mysql.yaml
similarity index 100%
rename from staging/mysql-cinder-pd/mysql.yaml
rename to mysql-cinder-pd/mysql.yaml
diff --git a/staging/volumes/cephfs/README.md b/volumes/cephfs/README.md
similarity index 100%
rename from staging/volumes/cephfs/README.md
rename to volumes/cephfs/README.md
diff --git a/staging/volumes/cephfs/cephfs-with-secret.yaml b/volumes/cephfs/cephfs-with-secret.yaml
similarity index 100%
rename from staging/volumes/cephfs/cephfs-with-secret.yaml
rename to volumes/cephfs/cephfs-with-secret.yaml
diff --git a/staging/volumes/cephfs/cephfs.yaml b/volumes/cephfs/cephfs.yaml
similarity index 100%
rename from staging/volumes/cephfs/cephfs.yaml
rename to volumes/cephfs/cephfs.yaml
diff --git a/staging/volumes/cephfs/secret/ceph-secret.yaml b/volumes/cephfs/secret/ceph-secret.yaml
similarity index 100%
rename from staging/volumes/cephfs/secret/ceph-secret.yaml
rename to volumes/cephfs/secret/ceph-secret.yaml
diff --git a/staging/volumes/glusterfs/README.md b/volumes/glusterfs/README.md
similarity index 100%
rename from staging/volumes/glusterfs/README.md
rename to volumes/glusterfs/README.md
diff --git a/staging/volumes/glusterfs/glusterfs-endpoints.json b/volumes/glusterfs/glusterfs-endpoints.json
similarity index 100%
rename from staging/volumes/glusterfs/glusterfs-endpoints.json
rename to volumes/glusterfs/glusterfs-endpoints.json
diff --git a/staging/volumes/glusterfs/glusterfs-pod.json b/volumes/glusterfs/glusterfs-pod.json
similarity index 100%
rename from staging/volumes/glusterfs/glusterfs-pod.json
rename to volumes/glusterfs/glusterfs-pod.json
diff --git a/staging/volumes/glusterfs/glusterfs-service.json b/volumes/glusterfs/glusterfs-service.json
similarity index 100%
rename from staging/volumes/glusterfs/glusterfs-service.json
rename to volumes/glusterfs/glusterfs-service.json
diff --git a/staging/volumes/iscsi/README.md b/volumes/iscsi/README.md
similarity index 100%
rename from staging/volumes/iscsi/README.md
rename to volumes/iscsi/README.md
diff --git a/staging/volumes/iscsi/chap-secret.yaml b/volumes/iscsi/chap-secret.yaml
similarity index 100%
rename from staging/volumes/iscsi/chap-secret.yaml
rename to volumes/iscsi/chap-secret.yaml
diff --git a/staging/volumes/iscsi/iscsi-chap.yaml b/volumes/iscsi/iscsi-chap.yaml
similarity index 100%
rename from staging/volumes/iscsi/iscsi-chap.yaml
rename to volumes/iscsi/iscsi-chap.yaml
diff --git a/staging/volumes/iscsi/iscsi.yaml b/volumes/iscsi/iscsi.yaml
similarity index 100%
rename from staging/volumes/iscsi/iscsi.yaml
rename to volumes/iscsi/iscsi.yaml
diff --git a/staging/volumes/rbd/README.md b/volumes/rbd/README.md
similarity index 100%
rename from staging/volumes/rbd/README.md
rename to volumes/rbd/README.md
diff --git a/staging/volumes/rbd/rbd-with-secret.yaml b/volumes/rbd/rbd-with-secret.yaml
similarity index 100%
rename from staging/volumes/rbd/rbd-with-secret.yaml
rename to volumes/rbd/rbd-with-secret.yaml
diff --git a/staging/volumes/rbd/rbd.yaml b/volumes/rbd/rbd.yaml
similarity index 100%
rename from staging/volumes/rbd/rbd.yaml
rename to volumes/rbd/rbd.yaml
diff --git a/staging/volumes/rbd/secret/ceph-secret.yaml b/volumes/rbd/secret/ceph-secret.yaml
similarity index 100%
rename from staging/volumes/rbd/secret/ceph-secret.yaml
rename to volumes/rbd/secret/ceph-secret.yaml
diff --git a/staging/volumes/storageos/README.md b/volumes/storageos/README.md
similarity index 100%
rename from staging/volumes/storageos/README.md
rename to volumes/storageos/README.md
diff --git a/staging/volumes/storageos/storageos-pod.yaml b/volumes/storageos/storageos-pod.yaml
similarity index 100%
rename from staging/volumes/storageos/storageos-pod.yaml
rename to volumes/storageos/storageos-pod.yaml
diff --git a/staging/volumes/storageos/storageos-pv.yaml b/volumes/storageos/storageos-pv.yaml
similarity index 100%
rename from staging/volumes/storageos/storageos-pv.yaml
rename to volumes/storageos/storageos-pv.yaml
diff --git a/staging/volumes/storageos/storageos-pvc.yaml b/volumes/storageos/storageos-pvc.yaml
similarity index 100%
rename from staging/volumes/storageos/storageos-pvc.yaml
rename to volumes/storageos/storageos-pvc.yaml
diff --git a/staging/volumes/storageos/storageos-pvcpod.yaml b/volumes/storageos/storageos-pvcpod.yaml
similarity index 100%
rename from staging/volumes/storageos/storageos-pvcpod.yaml
rename to volumes/storageos/storageos-pvcpod.yaml
diff --git a/staging/volumes/storageos/storageos-sc-pvc.yaml b/volumes/storageos/storageos-sc-pvc.yaml
similarity index 100%
rename from staging/volumes/storageos/storageos-sc-pvc.yaml
rename to volumes/storageos/storageos-sc-pvc.yaml
diff --git a/staging/volumes/storageos/storageos-sc-pvcpod.yaml b/volumes/storageos/storageos-sc-pvcpod.yaml
similarity index 100%
rename from staging/volumes/storageos/storageos-sc-pvcpod.yaml
rename to volumes/storageos/storageos-sc-pvcpod.yaml
diff --git a/staging/volumes/storageos/storageos-sc.yaml b/volumes/storageos/storageos-sc.yaml
similarity index 100%
rename from staging/volumes/storageos/storageos-sc.yaml
rename to volumes/storageos/storageos-sc.yaml
diff --git a/staging/volumes/storageos/storageos-secret.yaml b/volumes/storageos/storageos-secret.yaml
similarity index 100%
rename from staging/volumes/storageos/storageos-secret.yaml
rename to volumes/storageos/storageos-secret.yaml