Update and fix paths

Change-Id: I300a0dade6daf3d4c105da2d4e79f2ff08ad9586