Changed to conform to openshift structure
some changes after testing with openshift