Could you elaborate on the layout? Feel free to further comment on https://github.com/pantsbuild/pants/pull/6400. I can send another PR