restructuring for openshift