structuring changes for jenkins