jlo: reorganize dir to match newer repos

Change-Id: I9c9419b6db15e5ec76e645af22e2c71f83424018