Changed to Jenkins Compliant structure