Updated folder structure to accommodate with OpenShift repo