added openshift file stucture
corrected confilct