restructured for openshift