reorg for openshift