change structure to match openshift