Merge "Clean up structure of OSS jobs"