Merge "xci: Create skeletons for jobs and rename directory"