moved stuff around for smooth openshift deployment