Clean up structure of OSS jobs

Change-Id: Ie35ce47be6ccb0fb6cb8c06f7fa55bdcd8eddfee
6 files changed